summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Seemann <seemann.jochen@gmail.com>2015-05-09 10:25:11 +0200
committerMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>2015-06-22 07:53:29 +0000
commitee73df83639eecab2979677868a5cc9fadb2b7a0 (patch)
tree2a907a83fa0c12ffcbf109439550d4501238f63d
parent56aad2ad6074237537fecf10d0cda0f3872e7f71 (diff)
allow running msvc2013 mkspecs from msvc2015 shell
Visual Studio 2015 integrates the Windows Runtime development tools, including the msvc2013 compilers. This patch fixes the error that mspdb120.dll is missing. It is typically included through PATH variable of the shell, which points to the "wrong" location in this case. Change-Id: I46289721912d6b517c6083612582f67536d28b11 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index dfa8f8837b..aff8d9fcad 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -231,6 +231,9 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
<< kitDir + QStringLiteral("/include/shared")
<< kitDir + QStringLiteral("/include/winrt");
}
+
+ binDirs << vcInstallDir + QStringLiteral("/bin");
+
// Inherit PATH
binDirs << QString::fromLocal8Bit(qgetenv("PATH")).split(QLatin1Char(';'));