Merge 1.6 into master

Change-Id: Ie98233d955f3695da0b20069fb2317931e353e4e

1 files changed, 4 insertions, 0 deletions

diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index 258699dfb..ce3a540a4 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -160,6 +160,9 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath,
     }
     DummyFile actualDummyFile(actualDummyFilePath);
     const QString qbsClFrontend = nativeDummyFilePath + QStringLiteral(".exe");
+    const QString qbsClFrontendObj = nativeDummyFilePath + QStringLiteral(".obj");
+    DummyFile actualQbsClFrontend(qbsClFrontend);
+    DummyFile actualQbsClFrontendObj(qbsClFrontendObj);
 
     // The host compiler is the x86 compiler, which will execute on any edition of Windows
     // for which host compilers have been released so far (x86, x86_64, ia64)
@@ -171,6 +174,7 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath,
     runProcess(hostCompilerFilePath, QStringList()
                << QStringLiteral("/nologo")
                << QStringLiteral("/TC")
+               << (QStringLiteral("/Fo") + qbsClFrontendObj)
                << nativeDummyFilePath
                << QStringLiteral("/link")
                << (QStringLiteral("/out:") + qbsClFrontend), msvc2.environments[QString()]);