aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-06-15 10:06:31 +1000
committerAndreas Oberritter <obi@opendreambox.org>2014-01-20 21:19:37 +0100
commit72e9c200d2ba22df4ede4e25603dacfbe79b3bde (patch)
treed2449a71c2af7cdbd25deae9b97f657d5cc9d512
parent071aadb72f49f9e2937a687f8bbd3c2082c5234c (diff)
downloadopenembedded-core-contrib-72e9c200d2ba22df4ede4e25603dacfbe79b3bde.tar.gz
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> (cherry picked from commit ed78661e147780ceb1bc1e952b68740984d85971)
-rw-r--r--meta/classes/qt4e.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index 05c24efaa1..d93d003543 100644
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -8,6 +8,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"