From 7fce3a58ef60ad16744efff335fd21f55a0e0659 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 15 Jun 2013 10:06:31 +1000 Subject: [PATCH] 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. (From OE-Core rev: ed78661e147780ceb1bc1e952b68740984d85971) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/qt4e.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass index d7f5df8..850bb6a 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" -- 2.7.4