]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
qt4: fix QMAKE_QT_CONFIG being overwritten with empty value
authorJonathan Liu <net147@gmail.com>
Thu, 6 Jun 2013 03:19:23 +0000 (13:19 +1000)
committerSaul Wold <sgw@linux.intel.com>
Mon, 10 Jun 2013 21:51:28 +0000 (14:51 -0700)
commit5330905749828ea8befdee559c180754ac506b75
treeaace68407f9ae52440f6463ee0b8a9b0da700425
parent37b57b44ff83c718021da4f717fc66a28204c96c
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>
meta/recipes-qt/qt4/qt4-4.8.4.inc
meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch [new file with mode: 0644]