From 37b57b44ff83c718021da4f717fc66a28204c96c Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 7 Jun 2013 12:21:08 +1000 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-qt/qt4/qt4-native.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'meta/recipes-qt') 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 \ -- cgit 1.2.3-korg