Merge branch '2.3'

Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e

1 files changed, 7 insertions, 4 deletions

diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index 81a6fad47a..ec8f8e247f 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -39,6 +39,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/runconfiguration.h>
 #include <qtconcurrent/runextensions.h>
@@ -54,7 +55,7 @@ namespace {
 
 using namespace QtSupport;
 using QtSupport::DebuggingHelperBuildTask;
-
+using ProjectExplorer::ToolChain;
 
 class QmlDumpBuildTask;
 
@@ -67,8 +68,9 @@ class QmlDumpBuildTask : public QObject
     Q_OBJECT
 
 public:
-    explicit QmlDumpBuildTask(BaseQtVersion *version)
-        : m_buildTask(new DebuggingHelperBuildTask(version, DebuggingHelperBuildTask::QmlDump))
+    explicit QmlDumpBuildTask(BaseQtVersion *version, ToolChain *toolChain)
+        : m_buildTask(new DebuggingHelperBuildTask(version, toolChain,
+                                                   DebuggingHelperBuildTask::QmlDump))
         , m_failed(false)
     {
         qmlDumpBuilds()->insert(version->uniqueId(), this);
@@ -311,6 +313,7 @@ QStringList QmlDumpTool::installDirectories(const QString &qtInstallData)
 }
 
 void QmlDumpTool::pathAndEnvironment(ProjectExplorer::Project *project, BaseQtVersion *version,
+                                     ProjectExplorer::ToolChain *toolChain,
                                      bool preferDebug, QString *dumperPath, Utils::Environment *env)
 {
     QString path;
@@ -320,7 +323,7 @@ void QmlDumpTool::pathAndEnvironment(ProjectExplorer::Project *project, BaseQtVe
             if (!qmlDumpBuildTask->hasFailed())
                 qmlDumpBuildTask->updateProjectWhenDone(project, preferDebug);
         } else {
-            QmlDumpBuildTask *buildTask = new QmlDumpBuildTask(version);
+            QmlDumpBuildTask *buildTask = new QmlDumpBuildTask(version, toolChain);
             buildTask->updateProjectWhenDone(project, preferDebug);
             QFuture<void> task = QtConcurrent::run(&QmlDumpBuildTask::run, buildTask);
             const QString taskName = QmlDumpBuildTask::tr("Building helper");