classes/qmake2: export QMAKEPATH

QMAKEPATH is exported so that qmake is able to detect the webkit module, load it and add it to the QT_CONFIG variable. The detection is done in mkspecs/features/qt_config.prf which reads the qmake QMAKE_MKSPECS builtin. qmake will read QMAKEPATH, append /mkspecs to it and prepend it to the QMAKE_MKSPECS list builtin returned. qt_config.prf will then load modules matching modules/qt_*.pri inside each directory in QMAKE_MKSPECS.

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/classes/qmake2.bbclass | 1 +
 1 file changed, 1 insertion(+)

meta/classes/qmake2.bbclass +1 -1

index 8b9861c..03ad2f1 100644
@@ -5,6 +5,7 @@ inherit qmake_base
 
 DEPENDS_prepend = "qt4-tools-native "
 
+export QMAKEPATH = "${STAGING_DATADIR}/qt4"
 export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
--

1.8.2.3

Quoted 20 lines · Jonathan Liu

QMAKEPATH is exported so that qmake is able to detect the webkit module, load it and add it to the QT_CONFIG variable. The detection is done in mkspecs/features/qt_config.prf which reads the qmake QMAKE_MKSPECS builtin. qmake will read QMAKEPATH, append /mkspecs to it and prepend it to the QMAKE_MKSPECS list builtin returned. qt_config.prf will then load modules matching modules/qt_*.pri inside each directory in QMAKE_MKSPECS.

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/classes/qmake2.bbclass | 1 +
 1 file changed, 1 insertion(+)

meta/classes/qmake2.bbclass +0 -0

index 8b9861c..03ad2f1 100644
@@ -5,6 +5,7 @@ inherit qmake_base
 
 DEPENDS_prepend = "qt4-tools-native "
 

Quoted 7 lines

meta/classes/qmake2.bbclass +1 -1

+export QMAKEPATH = "${STAGING_DATADIR}/qt4"
 export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
--

1.8.2.3

This may be causing some packaging QA problems. I am investigating...