diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-06-07 12:21:08 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-11 15:38:03 +0100 |
| commit | 147b8dd481e67fe1caf44d2b5c43497d317a26be (patch) | |
| tree | 7822c5b44df3e174335f037fdce9ce24819113f4 /meta/recipes-qt | |
| parent | 027358f9406466c8384c8903f6371931a339db33 (diff) | |
| download | ast2050-yocto-poky-147b8dd481e67fe1caf44d2b5c43497d317a26be.zip ast2050-yocto-poky-147b8dd481e67fe1caf44d2b5c43497d317a26be.tar.gz | |
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.
(From OE-Core rev: 37b57b44ff83c718021da4f717fc66a28204c96c)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@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-native.inc | 12 |
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 9faef82..a153a37 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 \ |
