Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21

2 files changed, 18 insertions, 10 deletions

diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index 97aa4a01e57..edf8a82c50c 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -86,15 +86,7 @@ QdbRunConfiguration::QdbRunConfiguration(Target *target, Core::Id id)
     addAspect<WorkingDirectoryAspect>();
     addAspect<FullCommandLineAspect>(this);
 
-    setUpdater([this, target, exeAspect, symbolsAspect] {
-        const BuildTargetInfo bti = buildTargetInfo();
-        const FilePath localExecutable = bti.targetFilePath;
-        const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable);
-
-        exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-        symbolsAspect->setFilePath(localExecutable);
-    });
-
+    setUpdater([this] { updateTargetInformation(); });
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 
     setDefaultDisplayName(tr("Run on Boot2Qt Device"));
@@ -110,6 +102,21 @@ Tasks QdbRunConfiguration::checkForIssues() const
     return tasks;
 }
 
+void QdbRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
+{
+    updateTargetInformation();
+}
+
+void QdbRunConfiguration::updateTargetInformation()
+{
+    const BuildTargetInfo bti = buildTargetInfo();
+    const FilePath localExecutable = bti.targetFilePath;
+    const DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
+
+    aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
+    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
+}
+
 QString QdbRunConfiguration::defaultDisplayName() const
 {
     return RunConfigurationFactory::decoratedTargetName(buildKey(), target());
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.h b/src/plugins/boot2qt/qdbrunconfiguration.h
index f1a0bf0443d..72e5fa2eb42 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.h
+++ b/src/plugins/boot2qt/qdbrunconfiguration.h
@@ -47,7 +47,8 @@ public:
 
 private:
     ProjectExplorer::Tasks checkForIssues() const override;
-
+    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
+    void updateTargetInformation();
     QString defaultDisplayName() const;
 };