summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-01-13 15:04:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 16:10:11 +0000
commit7263adda21f58e0f76b0228b0f5657aa84879927 (patch)
tree83803d1ece944a6817f6243851cf9a5a1e2545cf /meta/recipes-qt
parentc5998e6def9b320eb50247765b096743f6efbfe8 (diff)
downloadpoky-7263adda21f58e0f76b0228b0f5657aa84879927.tar.gz
qt4: add qt4-embedded 4.6.3 from meta-openembedded
Changes from the meta-openembedded version: * Change the order of includes so that embedded takes precedence (ensuring SRC_URI additions from qt-embedded.inc work) * Specify -embedded in qt-embedded.inc * Remove SRC_URI and S which should come from qt-${PV}.inc * Remove QT_DIR_NAME and QT_LIBINFIX as these come from qt4e.bbclass * Correct LICENSE * Set DESCRIPTION instead of SUMMARY as SUMMARY will inherit by default * Add qthelp-lib-qtclucene.patch (required to build) * Whitespace fixes Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/qte.sh7
-rw-r--r--meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch86
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc34
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb9
4 files changed, 136 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/qte.sh b/meta/recipes-qt/qt4/files/qte.sh
new file mode 100644
index 0000000000..21d6ecbd6a
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qte.sh
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3if [ -e /dev/input/touchscreen0 ]
4then
5 QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
6 export QWS_MOUSE_PROTO
7fi
diff --git a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
new file mode 100644
index 0000000000..1d250d8a98
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
@@ -0,0 +1,86 @@
1qt-embedded: fix linker error in do_compile
2
3This patch ensures that we link to libQtCLucene where required (i.e. when
4linking to libQtHelp) avoiding a linker error.
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro
9===================================================================
10--- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000
11+++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000
12@@ -76,3 +76,10 @@
13 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
14 sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
15
16+qclucene = QtCLucene$${QT_LIBINFIX}
17+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
18+ mac:qclucene = $${qclucene}_debug
19+ win32:qclucene = $${qclucene}d
20+}
21+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
22+LIBS_PRIVATE += -l$$qclucene
23Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro
24===================================================================
25--- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000
26+++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000
27@@ -18,3 +18,11 @@
28 INSTALLS += target sources
29
30 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
31+
32+qclucene = QtCLucene$${QT_LIBINFIX}
33+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
34+ mac:qclucene = $${qclucene}_debug
35+ win32:qclucene = $${qclucene}d
36+}
37+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
38+LIBS_PRIVATE += -l$$qclucene
39Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro
40===================================================================
41--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000
42+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000
43@@ -85,3 +85,11 @@
44 DEFINES += USE_STATIC_SQLITE_PLUGIN
45 }
46 }
47+
48+qclucene = QtCLucene$${QT_LIBINFIX}
49+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
50+ mac:qclucene = $${qclucene}_debug
51+ win32:qclucene = $${qclucene}d
52+}
53+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
54+LIBS_PRIVATE += -l$$qclucene
55Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
56===================================================================
57--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000
58+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000
59@@ -12,3 +12,11 @@
60 main.cpp
61
62 HEADERS += ../shared/helpgenerator.h
63+
64+qclucene = QtCLucene$${QT_LIBINFIX}
65+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
66+ mac:qclucene = $${qclucene}_debug
67+ win32:qclucene = $${qclucene}d
68+}
69+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
70+LIBS_PRIVATE += -l$$qclucene
71Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
72===================================================================
73--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000
74+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000
75@@ -12,3 +12,11 @@
76 main.cpp
77
78 HEADERS += ../shared/helpgenerator.h
79+
80+qclucene = QtCLucene$${QT_LIBINFIX}
81+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
82+ mac:qclucene = $${qclucene}_debug
83+ win32:qclucene = $${qclucene}d
84+}
85+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
86+LIBS_PRIVATE += -l$$qclucene
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
new file mode 100644
index 0000000000..2ed1819f6f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -0,0 +1,34 @@
1DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
2SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3"
4PRIORITY = "optional"
5HOMEPAGE = "http://qt.nokia.com"
6DEPENDS += "directfb tslib"
7INC_PR = "r26"
8
9QT_BASE_NAME ?= "qt4-embedded"
10QT_BASE_LIB ?= "libqt-embedded"
11
12# Set necessary variables in the profile
13SRC_URI += "file://qte.sh"
14
15QT_CONFIG_FLAGS += " \
16 -embedded ${QT_ARCH} \
17 -qtlibinfix ${QT_LIBINFIX} \
18 -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
19 -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
20 -qt-kbd-tty \
21 -DQT_KEYPAD_NAVIGATION \
22 "
23
24require qt4.inc
25
26do_install_append() {
27 install -d ${D}${sysconfdir}/profile.d/
28 install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
29}
30
31FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
32
33inherit qt4e
34
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
new file mode 100644
index 0000000000..dd662aa3d8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
@@ -0,0 +1,9 @@
1require qt-${PV}.inc
2require qt4-embedded.inc
3
4SRC_URI += "file://qthelp-lib-qtclucene.patch"
5
6PR = "${INC_PR}.1"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9