diff options
author | Jonathan Liu <net147@gmail.com> | 2013-06-06 13:19:23 +1000 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2013-06-10 14:51:28 -0700 |
commit | 5330905749828ea8befdee559c180754ac506b75 (patch) | |
tree | aace68407f9ae52440f6463ee0b8a9b0da700425 /meta/recipes-qt/qt4/qt4-4.8.4.inc | |
parent | 37b57b44ff83c718021da4f717fc66a28204c96c (diff) | |
download | openembedded-core-5330905749828ea8befdee559c180754ac506b75.tar.gz |
qt4: fix QMAKE_QT_CONFIG being overwritten with empty value
QMAKE_QT_CONFIG is set by the linux-oe-g++ mkspec but it is overwritten
with an empty value read from .qmake.cache. Avoid this by first checking
if the value from .qmake.cache is not empty before assigning it to
QMAKE_QT_CONFIG.
This allows variables from qconfig.pri such as QT_ARCH, QT_CONFIG,
QT_VERSION, etc. to be queried by qmake projects.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4.inc b/meta/recipes-qt/qt4/qt4-4.8.4.inc index ce12b1e52b..e87daccf5a 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.4.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.4.inc @@ -25,6 +25,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr file://0023-qtnetwork-blacklist-two-more-certificates.patch \ file://0024-Change-all-shmget-calls-to-user-only-memory.patch \ file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \ + file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \ file://g++.conf \ file://linux.conf \ " |