Merge remote-tracking branch 'origin/4.9'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8

src/plugins/debugger/debuggerruncontrol.cpp

@@ -61,6 +61,7 @@
 #include <utils/temporarydirectory.h>
 #include <utils/temporaryfile.h>
 #include <utils/url.h>
+#include <utils/winutils.h>
 
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
@@ -565,6 +566,17 @@ void DebuggerRunTool::start()
     if (!fixupParameters())
         return;
 
+    if (m_runParameters.cppEngineType == CdbEngineType
+            && Utils::is64BitWindowsBinary(m_runParameters.inferior.executable)
+            && !Utils::is64BitWindowsBinary(m_runParameters.debugger.executable)) {
+        reportFailure(
+            DebuggerPlugin::tr(
+                "%1 is a 64 bit executable which can not be debugged by a 32 bit Debugger.\n"
+                "Please select a 64 bit Debugger in the kit settings for this kit.")
+                .arg(m_runParameters.inferior.executable));
+        return;
+    }
+
     Utils::globalMacroExpander()->registerFileVariables(
                 "DebuggedExecutable", tr("Debugged executable"),
                 [this] { return m_runParameters.inferior.executable; }