From 0859095b7ccd3c183b4759613b45fe652475a80e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 16 Jan 2017 10:20:48 +0100
Subject: [PATCH] MSVC: Do not ask to return utf-8 from Windows Vista and
 earlier

Do not ask the script getting the MSVC environment to return utf-8 output
prior to windows 7. Attempting that breaks the script and makes it return
empty output.

Task-number: QTCREATORBUG-17501
Change-Id: Ic5a87f87cea9e77687744c712c4f24aa9b20a6e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/projectexplorer/abstractmsvctoolchain.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
index 088c095d8af..7347dd7a79f 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
@@ -30,10 +30,12 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 
+#include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
 #include <utils/synchronousprocess.h>
 
 #include <QDir>
+#include <QSysInfo>
 #include <QTemporaryFile>
 #include <QTextCodec>
 
@@ -271,7 +273,8 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(Utils::Environment &env,
         call += ' ';
         call += batchArgs.toLocal8Bit();
     }
-    saver.write("chcp 65001\r\n");
+    if (Utils::HostOsInfo::isWindowsHost() && QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7)
+        saver.write("chcp 65001\r\n"); // Only works for Windows 7 or later
     saver.write(call + "\r\n");
     saver.write("@echo " + marker.toLocal8Bit() + "\r\n");
     saver.write("set\r\n");