summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-08-11 22:25:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 14:26:18 (GMT)
commitf9e9d8d45c1718e5bb319a4442d8d794304d3fa8 (patch)
tree0e132601725b2e38f805e05c26b49ad75e749d01 /meta/recipes-qt
parenta7500e27a70a2e6bf575fbb7324c001a5f13d1f5 (diff)
downloadpoky-f9e9d8d45c1718e5bb319a4442d8d794304d3fa8.tar.gz
qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got packaged. This is now fixed and QML components are now installed into ${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins package. Additionally qmlviewer and the examples/demos are now dependent upon these plugins as needed. Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 by Simon Busch <morphis@gravedo.de> (From OE-Core rev: 49c43e2bea64f70a22a2741ea280bd1c13e5110a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc14
3 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 9b7e071..d464a1d 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3" 3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 5DEPENDS += "directfb tslib"
6INC_PR = "r28" 6INC_PR = "r29"
7 7
8QT_BASE_NAME ?= "qt4-embedded" 8QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index b8633de..234cb89 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r25" 8INC_PR = "r26"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 881b445..815ebc2 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -98,7 +98,8 @@ OTHER_PACKAGES = "\
98 ${QT_BASE_NAME}-pixeltool \ 98 ${QT_BASE_NAME}-pixeltool \
99 ${QT_BASE_NAME}-qmlviewer \ 99 ${QT_BASE_NAME}-qmlviewer \
100 ${QT_BASE_NAME}-xmlpatterns \ 100 ${QT_BASE_NAME}-xmlpatterns \
101 ${QT_BASE_NAME}-qt3to4" 101 ${QT_BASE_NAME}-qt3to4 \
102 ${QT_BASE_NAME}-qml-plugins"
102 103
103PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" 104PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
104PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" 105PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
@@ -122,11 +123,15 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \
122 ${QT_BASE_NAME}-examples \ 123 ${QT_BASE_NAME}-examples \
123 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 124 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
124 ${QT_BASE_NAME}-plugin-imageformat-jpeg \ 125 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
126 ${QT_BASE_NAME}-qml-plugins \
125 ${QT_BASE_NAME}-assistant \ 127 ${QT_BASE_NAME}-assistant \
126 ${PN}-doc" 128 ${PN}-doc"
127RRECOMMENDS_${QT_BASE_NAME}-examples += " \ 129RRECOMMENDS_${QT_BASE_NAME}-examples += " \
128 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 130 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
129 ${QT_BASE_NAME}-plugin-imageformat-jpeg" 131 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
132 ${QT_BASE_NAME}-qml-plugins"
133RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
134 ${QT_BASE_NAME}-qml-plugins"
130 135
131FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" 136FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*"
132FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" 137FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*"
@@ -160,7 +165,8 @@ FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf"
160FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*" 165FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*"
161FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" 166FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
162FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" 167FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
163 168FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
169FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug"
164 170
165do_configure() { 171do_configure() {
166 unset QMAKESPEC 172 unset QMAKESPEC
@@ -183,6 +189,7 @@ do_configure() {
183 echo "Libraries=${libdir}" >> $QT_CONF_PATH 189 echo "Libraries=${libdir}" >> $QT_CONF_PATH
184 echo "Binaries=${bindir}" >> $QT_CONF_PATH 190 echo "Binaries=${bindir}" >> $QT_CONF_PATH
185 echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH 191 echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
192 echo "Imports=${libdir}/${QT_DIR_NAME}/imports" >> $QT_CONF_PATH
186 echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH 193 echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
187 echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH 194 echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
188 echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH 195 echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
@@ -200,6 +207,7 @@ do_configure() {
200 -docdir ${docdir}/${QT_DIR_NAME} \ 207 -docdir ${docdir}/${QT_DIR_NAME} \
201 -headerdir ${includedir}/${QT_DIR_NAME} \ 208 -headerdir ${includedir}/${QT_DIR_NAME} \
202 -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ 209 -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
210 -importdir ${libdir}/${QT_DIR_NAME}/imports \
203 -translationdir ${datadir}/${QT_DIR_NAME}/translations \ 211 -translationdir ${datadir}/${QT_DIR_NAME}/translations \
204 -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ 212 -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
205 -demosdir ${bindir}/${QT_DIR_NAME}/demos \ 213 -demosdir ${bindir}/${QT_DIR_NAME}/demos \