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

VS 2017: Fall back to "x86" as arch if it is not "arm" or "x64"

Browse Source 
The same as for other visual studio versions use "x86" as arch instead
of win32. arch is used to determine library paths and these use x86 and
not win32.

As compilerArch is not used in MSVC 2017 it can be removed.

Task-number: QTBUG-60530
Change-Id: I47157eb1d7ae9d913461210d34858ffb37c81586
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Oliver Wolff 2017-05-03 07:36:06 +02:00
parent d56a6aa124
commit 9baf7bad59
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/msvc_nmake.cpp
View File

@ -94,8 +94,8 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
compiler += QStringLiteral("x64");
compilerArch = QStringLiteral("amd64");
} else {
arch = QStringLiteral("x86");
compiler += QStringLiteral("x86");
compilerArch = QStringLiteral("amd64");
}
} else {
if (arch == QLatin1String("arm")) {