Merge remote-tracking branch 'origin/master' into 4.4

Change-Id: I09a8dae9f7d66d193f382143dde915519bd329df

src/plugins/cpptools/projectinfo.cpp

@@ -40,9 +40,7 @@ ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
         isMsvc2015ToolChain
                 = toolChain->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor;
         wordWidth = toolChain->targetAbi().wordWidth();
-        targetTriple = type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID
-            ? QLatin1String("i686-pc-windows-msvc")
-            : toolChain->originalTargetTriple(); // OK, compiler run is already cached.
+        targetTriple = toolChain->originalTargetTriple();
 
         // ...and save the potentially expensive operations for later so that
         // they can be run from a worker thread.

src/plugins/debugger/analyzer/analyzermanager.h

@@ -30,6 +30,8 @@
 
 #include "../debuggermainwindow.h"
 
+#include <projectexplorer/runconfiguration.h>
+
 #include <QWidget>
 
 #include <QCoreApplication>

src/plugins/projectexplorer/abstractmsvctoolchain.cpp

@@ -97,6 +97,13 @@ bool AbstractMsvcToolChain::isValid() const
     return fi.isFile() && fi.isExecutable();
 }
 
+QString AbstractMsvcToolChain::originalTargetTriple() const
+{
+    return m_abi.wordWidth() == 64
+            ? QLatin1String("x86_64-pc-windows-msvc")
+            : QLatin1String("i686-pc-windows-msvc");
+}
+
 ToolChain::PredefinedMacrosRunner AbstractMsvcToolChain::createPredefinedMacrosRunner() const
 {
     Utils::Environment env(m_lastEnvironment);

src/plugins/projectexplorer/abstractmsvctoolchain.h

@@ -50,6 +50,8 @@ public:
 
     bool isValid() const override;
 
+    QString originalTargetTriple() const override;
+
     PredefinedMacrosRunner createPredefinedMacrosRunner() const override;
     QByteArray predefinedMacros(const QStringList &cxxflags) const override;
     CompilerFlags compilerFlags(const QStringList &cxxflags) const override;

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -106,6 +106,10 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
         if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) {
             preferDebugDump = bc->buildType() == BuildConfiguration::Debug;
             setPreferDump = true;
+            // Append QML2_IMPORT_PATH if it is defined in build configuration.
+            // It enables qmlplugindump to correctly dump custom plugins or other dependent
+            // plugins that are not installed in default Qt qml installation directory.
+            projectInfo.qmlDumpEnvironment.appendOrSet("QML2_IMPORT_PATH", bc->environment().value("QML2_IMPORT_PATH"), ":");
         }
     }
     if (!setPreferDump && qtVersion)