From f13f10ee0d7e7e93fbe73e3f763a47de0c08df65 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Thu, 6 Feb 2014 11:20:23 +0200 Subject: [PATCH] qmake WinRT: Default to x86 for lib path If VCPROJ_ARCH is not recognized or unset, make "arch" default to x86, or link won't find the libs. Change-Id: If2cbda37a80c0fa43e1464775c036cebf10f931a Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_nmake.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index acccdc1bdc..24465ad152 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -123,6 +123,8 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) } else if (arch == QStringLiteral("x64")) { compiler = QStringLiteral("x86_amd64"); compilerArch = QStringLiteral("amd64"); + } else { + arch = QStringLiteral("x86"); } const QString msvcVer = project->first("MSVC_VER").toQString();