From: Jonathan Liu <net147@gmail.com>
Date: Sat, 15 Jun 2013 00:06:31 +0000 (+1000)
Subject: qt4e.bbclass: export OE_QMAKE_QT_CONFIG
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~36820
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed78661e147780ceb1bc1e952b68740984d85971;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.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 <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index d7f5df842a3..850bb6a717a 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"