diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-06-15 10:06:31 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-02 22:23:51 +0100 |
| commit | 85f0cf943d3165a603ccb058d838bc0b6a80ce43 (patch) | |
| tree | bbcea9527fb5c63efd3a57a58bff21e0a879ac50 /meta | |
| parent | 0214dba342dc0f48bd429f5a4f9a1223835d7ec6 (diff) | |
| download | poky-85f0cf943d3165a603ccb058d838bc0b6a80ce43.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.
(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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/qt4e.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
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" | |||
| 9 | # override variables set by qmake-base to compile Qt/Embedded apps | 9 | # override variables set by qmake-base to compile Qt/Embedded apps |
| 10 | # | 10 | # |
| 11 | export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" | 11 | export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" |
| 12 | export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri" | ||
| 12 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" | 13 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" |
| 13 | export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" | 14 | export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" |
| 14 | export OE_QMAKE_LIBS_QT = "qt" | 15 | export OE_QMAKE_LIBS_QT = "qt" |