diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-22 15:46:36 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-01-29 09:30:20 +0000 |
| commit | b9ae324dc9c815c2326803da0a3d0414cf7a2903 (patch) | |
| tree | 5e1e9517642fbc58d29392d4e83f0f04e74c33bd /qmake | |
| parent | 8172fe46472614d4ecf6fce03ae5c5f706820cd7 (diff) | |
fix fallback architecture for MSVC
Use x86 for a 32 bit build of qmake and x86_64 for 64 bit.
This is needed for shells that do not set VCINSTALLDIR.
Change-Id: I0843c1a590161669530b99f45ab59d523e6596c3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index fe089c1059..9b5291a08e 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -962,7 +962,11 @@ static ProString msvcBinDirToQMakeArch(QString subdir) static ProString defaultMsvcArchitecture() { +#if defined(Q_OS_WIN64) + return ProString("x86_64"); +#else return ProString("x86"); +#endif } static ProString msvcArchitecture(const QString &vcInstallDir, const QString &pathVar) |