From: Jonathan Liu Date: Sat, 15 Jun 2013 00:06:31 +0000 (+1000) Subject: qt4e.bbclass: export OE_QMAKE_QT_CONFIG X-Git-Tag: 2015-4~5983 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ed78661e147780ceb1bc1e952b68740984d85971;p=openembedded-core.git qt4e.bbclass: export OE_QMAKE_QT_CONFIG 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. Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold --- diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass index d7f5df842a..850bb6a717 100644 --- a/meta/classes/qt4e.bbclass +++ b/meta/classes/qt4e.bbclass @@ -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"