summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt4.inc
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/qt4/qt4.inc
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/qt4/qt4.inc')
0 files changed, 0 insertions, 0 deletions