diff options
| author | Felipe F. Tonello <eu@felipetonello.com> | 2013-06-12 11:21:04 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-13 17:38:11 +0100 |
| commit | 9bb1ba46952321b3d6dff50d08cb0693505d3b8f (patch) | |
| tree | 0b4325555475f6e605f629e0fd28fe5c4da2f1be /meta/classes/qmake2.bbclass | |
| parent | 4505618ac3be81a44a7da2783efe3d618bf5890f (diff) | |
| download | poky-9bb1ba46952321b3d6dff50d08cb0693505d3b8f.tar.gz | |
qt: update qmake2 class to export qconfig.pri mkspec
This is necessary when Qt applications want to know variables such as
QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, GCC version, etc.
(From OE-Core rev: dcaa40e65d986587fa7c44f4285bbd0883478cc3)
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
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/classes/qmake2.bbclass')
| -rw-r--r-- | meta/classes/qmake2.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass index 35aaebb123..6e73ad2d1e 100644 --- a/meta/classes/qmake2.bbclass +++ b/meta/classes/qmake2.bbclass | |||
| @@ -6,6 +6,7 @@ inherit qmake_base | |||
| 6 | DEPENDS_prepend = "qt4-tools-native " | 6 | DEPENDS_prepend = "qt4-tools-native " |
| 7 | 7 | ||
| 8 | export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" | 8 | export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" |
| 9 | export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri" | ||
| 9 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" | 10 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" |
| 10 | export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" | 11 | export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" |
| 11 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" | 12 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" |