From 9baf7bad5965a6120b7262e5be918ade6ab5d556 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 3 May 2017 07:36:06 +0200 Subject: VS 2017: Fall back to "x86" as arch if it is not "arm" or "x64" 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 --- qmake/generators/win32/msvc_nmake.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/generators/win32/msvc_nmake.cpp') diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 8ac462da6b..ef1eaf095e 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -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")) { -- cgit v1.2.3