Qbs run config: Run executable from installed location, if possible

It's been like that for a long time, but the behavior was inadvertantly
changed in a recent refactoring.

Change-Id: I2f301c995c1f9bb235718e02326c4c64dea91694
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 14 insertions, 2 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 13441da885..64b6436818 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -31,6 +31,7 @@
 
 #include <coreplugin/variablechooser.h>
 
+#include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/runconfigurationaspects.h>
@@ -165,11 +166,22 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
     m_envCache.insert(key, env);
 }
 
+Utils::FileName QbsRunConfiguration::executableToRun(const BuildTargetInfo &targetInfo) const
+{
+    const FileName appInBuildDir = targetInfo.targetFilePath;
+    if (target()->deploymentData().localInstallRoot().isEmpty())
+        return appInBuildDir;
+    const QString deployedAppFilePath = target()->deploymentData()
+            .deployableForLocalFile(appInBuildDir.toString()).remoteFilePath();
+    const FileName appInLocalInstallDir = target()->deploymentData().localInstallRoot()
+            + deployedAppFilePath;
+    return appInLocalInstallDir.exists() ? appInLocalInstallDir : appInBuildDir;
+}
+
 void QbsRunConfiguration::updateTargetInformation()
 {
     BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey());
-    FileName executable = bti.targetFilePath;
-
+    const FileName executable = executableToRun(bti);
     auto terminalAspect = extraAspect<TerminalAspect>();
     if (!terminalAspect->isUserSet())
         terminalAspect->setUseTerminal(bti.usesTerminal);