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, 20 insertions, 11 deletions

diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 9e9707cbfc..7ea647c373 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -69,17 +69,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
     libAspect->setLabelText(tr("Path to Qt libraries on device"));
     libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
 
-    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);
-
-        emit enabledChanged();
-    });
+    setUpdater([this] { updateTargetInformation(); });
 
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
@@ -98,6 +88,22 @@ Runnable QnxRunConfiguration::runnable() const
     return r;
 }
 
+void QnxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
+{
+    updateTargetInformation();
+}
+
+void QnxRunConfiguration::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);
+    emit enabledChanged();
+}
+
 // QnxRunConfigurationFactory
 
 QnxRunConfigurationFactory::QnxRunConfigurationFactory()
diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h
index 75ec72a66c..eaa0980d50 100644
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -48,6 +48,9 @@ public:
 
 private:
     ProjectExplorer::Runnable runnable() const override;
+    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
+
+    void updateTargetInformation();
 };
 
 class QnxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory