qt4e.bbclass: export OE_QMAKE_QT_CONFIG
authorJonathan Liu <net147@gmail.com>
Sat, 15 Jun 2013 00:06:31 +0000 (10:06 +1000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 2 Jul 2013 21:23:51 +0000 (22:23 +0100)
The class is inheriting qmake2.bbclass which exports OE_QMAKE_QT_CONFIG
pointing to the qt4 qconfig.pri when it should be pointing to the
qt4-embedded qconfig.pri.

(From OE-Core rev: ed78661e147780ceb1bc1e952b68740984d85971)

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>
meta/classes/qt4e.bbclass

index d7f5df8..850bb6a 100644 (file)
@@ -9,6 +9,7 @@ QT_LIBINFIX = "E"
 # override variables set by qmake-base to compile Qt/Embedded apps
 #
 export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri"
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"