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)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 11 Jun 2013 14:38:03 +0000 (15:38 +0100)
commit7844a9736e8187019f33164c1158c5bbfbea9635
tree8ddf555858fcfeefeae720d7435e10dfeb7b9305
parent710f67de04bda5cdebefc8455b2e5d5abe1af04b
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.

(From OE-Core rev: 5330905749828ea8befdee559c180754ac506b75)

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>
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]