1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix fallback architecture for MSVC

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2015-01-22 15:46:36 +01:00 committed by Jani Heikkinen
parent 8172fe4647
commit b9ae324dc9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/library/qmakeevaluator.cpp
View File

@ -962,7 +962,11 @@ static ProString msvcBinDirToQMakeArch(QString subdir)
static ProString defaultMsvcArchitecture() static ProString defaultMsvcArchitecture()
{ {
#if defined(Q_OS_WIN64)
return ProString("x86_64");
#else
return ProString("x86"); return ProString("x86");
#endif
} }
static ProString msvcArchitecture(const QString &vcInstallDir, const QString &pathVar) static ProString msvcArchitecture(const QString &vcInstallDir, const QString &pathVar)