summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-02-06 11:20:23 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 15:29:50 +0100
commitf13f10ee0d7e7e93fbe73e3f763a47de0c08df65 (patch)
treec8f7b6555cf69891214fcfce02372b840b472e75 /qmake/generators
parent704c4d0e107969cbfde7ba35a1a3f332a2268773 (diff)
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 <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp2
1 files changed, 2 insertions, 0 deletions
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();