diff options
author | Jonathan Liu <net147@gmail.com> | 2013-06-06 02:42:13 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 15:44:45 (GMT) |
commit | b5f252a7564e5b51689ca3a95125eabaec4ffea4 (patch) | |
tree | 4c1219e28320b51835a4d5de536b7ef765239da7 /dist/changes-3.3.6 | |
parent | d1f391b1bb75b0f466e93f818674dde2e9135f36 (diff) | |
download | Qt-b5f252a7564e5b51689ca3a95125eabaec4ffea4.zip Qt-b5f252a7564e5b51689ca3a95125eabaec4ffea4.tar.gz Qt-b5f252a7564e5b51689ca3a95125eabaec4ffea4.tar.bz2 |
Don't overwrite QMAKE_QT_CONFIG with empty value
If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten
with an empty value 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 was already addressed differently in Qt 5.
Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'dist/changes-3.3.6')
0 files changed, 0 insertions, 0 deletions