diff options
author | Giotis Nikos <giotis.nikos@gmail.com> | 2012-02-06 23:32:44 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 15:26:16 (GMT) |
commit | 679def06d8cddbf4869ddc400546c4f5b2fbc61f (patch) | |
tree | 6c1ce595b47d7b5d260ac2862bbdde38a5534f18 /qmake/generators/makefile.h | |
parent | b0601630dd0ddabfaa3b97d042ee02b981d95988 (diff) | |
download | Qt-679def06d8cddbf4869ddc400546c4f5b2fbc61f.zip Qt-679def06d8cddbf4869ddc400546c4f5b2fbc61f.tar.gz Qt-679def06d8cddbf4869ddc400546c4f5b2fbc61f.tar.bz2 |
Fix qmake evaluation of QMAKE_TARGET.arch on msvc2010 x86_64
This change is needed because msvc2010 tools have a '\' character at
the end of environment variable VCINSTALLDIR. This variable on msvc2008
does not have this '\' character at its end. Without this change
QMAKE_TARGET.arch on msvc2010 x64 evaluates to x86 instead of x86_64.
cherry picked from qtbase 66f56024ccfc39f818e0f16b44d4916b6a03d322
Task-number: QTBUG-22686
Change-Id: Ibc7546c522506b2c4e7a729a8de319aea788b662
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/generators/makefile.h')
0 files changed, 0 insertions, 0 deletions