summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-06-07 12:21:08 +1000
committerSaul Wold <sgw@linux.intel.com>2013-06-10 14:51:28 -0700
commit37b57b44ff83c718021da4f717fc66a28204c96c (patch)
tree7c6b45fc7d00956ef359a13a6c3844e01efbc88f /meta/recipes-qt
parent542fefa61f0ac1dcdacac2630fd44950ac11cdd9 (diff)
downloadopenembedded-core-37b57b44ff83c718021da4f717fc66a28204c96c.tar.gz
openembedded-core-37b57b44ff83c718021da4f717fc66a28204c96c.tar.bz2
openembedded-core-37b57b44ff83c718021da4f717fc66a28204c96c.zip
qt4-native: update configure paths to match target
qmake2 was being built with paths different to the target Qt. The incorrect paths can be seen by running qmake2 -query: QT_INSTALL_DOCS:${STAGING_DIR_NATIVE}/usr/doc should be /usr/share/doc/qt4 QT_INSTALL_PLUGINS:${STAGING_DIR_NATIVE}/usr/plugins should be /usr/lib/qt4/plugins QT_INSTALL_IMPORTS:${STAGING_DIR_NATIVE}/usr/imports should be /usr/lib/qt4/imports QT_INSTALL_TRANSLATIONS:${STAGING_DIR_NATIVE}/usr/translations should be /usr/share/qt4/translations QT_INSTALL_EXAMPLES:${STAGING_DIR_NATIVE}/usr/examples should be /usr/bin/qt4/examples QT_INSTALL_DEMOS:${STAGING_DIR_NATIVE}/usr/demos should be /usr/bin/qt4/demos QMAKE_MKSPECS:${STAGING_DIR_NATIVE}/usr/mkspecs should be /usr/share/qt4/mkspecs Use the same paths as target Qt for consistency. As the mkspecs are installed to /usr/share/qt4/mkspecs not /usr/mkspecs, qmake2 was unable to detect and load the webkit module (it is detected by loading modules/qt_*.pri inside the mkspecs directory) so webkit was missing from QT_CONFIG if a qmake project reads the QT_CONFIG variable. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 9faef82774..a153a37fba 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -25,6 +25,17 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
EXTRA_OECONF = "-prefix ${prefix} \
+ -bindir ${bindir} \
+ -libdir ${libdir} \
+ -datadir ${datadir}/qt4 \
+ -sysconfdir ${sysconfdir}/qt4 \
+ -docdir ${docdir}/qt4 \
+ -headerdir ${includedir}/qt4 \
+ -plugindir ${libdir}/qt4/plugins \
+ -importdir ${libdir}/qt4/imports \
+ -translationdir ${datadir}/qt4/translations \
+ -examplesdir ${bindir}/qt4/examples \
+ -demosdir ${bindir}/qt4/demos \
-L ${STAGING_LIBDIR_NATIVE} \
-I ${STAGING_INCDIR_NATIVE} \
-qt-libjpeg -system-zlib \
@@ -34,7 +45,6 @@ EXTRA_OECONF = "-prefix ${prefix} \
-no-nas-sound \
-no-nis -no-openssl \
-verbose -release \
- -headerdir ${includedir}/qt4 \
-embedded -no-freetype -no-glib -no-iconv \
-exceptions -xmlpatterns \
-qt3support \