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

1 files changed, 17 insertions, 10 deletions

diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 81a855d030..020ac87691 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -69,21 +69,17 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I
     if (HostOsInfo::isAnyUnixHost())
         addAspect<X11ForwardingAspect>();
 
-    setUpdater([this, target, exeAspect, symbolsAspect] {
-        BuildTargetInfo bti = buildTargetInfo();
-        const FilePath localExecutable = bti.targetFilePath;
-        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);
     connect(target, &Target::kitChanged, this, &RunConfiguration::update);
 }
 
+void RemoteLinuxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
+{
+    updateTargetInformation();
+}
+
 Runnable RemoteLinuxRunConfiguration::runnable() const
 {
     Runnable r = RunConfiguration::runnable();
@@ -93,6 +89,17 @@ Runnable RemoteLinuxRunConfiguration::runnable() const
     return r;
 }
 
+void RemoteLinuxRunConfiguration::updateTargetInformation()
+{
+    BuildTargetInfo bti = buildTargetInfo();
+    const FilePath localExecutable = bti.targetFilePath;
+    DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
+
+    aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
+    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
+
+    emit enabledChanged();
+}
 
 // RemoteLinuxRunConfigurationFactory