aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-05-07 10:44:18 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-05-07 09:01:58 +0000
commitb36965776c10c43eb6fe91eb0f2bb10a71177c56 (patch)
tree36b512272bcb5a96ecbe625383d33d91167349bc /src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
parent8b452b28d226c07b504679e6acf7fe9e0fbf5edf (diff)
QbsProjectManager: Fix the paths of non-installed executables
... in run configurations. One check was missing. This amends c6cd9e8fbe9ed. Change-Id: If398a719adbb5a5c2a527b70d274751ada91abe4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp')
-rw-r--r--src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 6c8ef0a591..83c6ea4a6e 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -130,6 +130,8 @@ Utils::FileName QbsRunConfiguration::executableToRun(const BuildTargetInfo &targ
return appInBuildDir;
const QString deployedAppFilePath = target()->deploymentData()
.deployableForLocalFile(appInBuildDir.toString()).remoteFilePath();
+ if (deployedAppFilePath.isEmpty())
+ return appInBuildDir;
const FileName appInLocalInstallDir = target()->deploymentData().localInstallRoot()
+ deployedAppFilePath;
return appInLocalInstallDir.exists() ? appInLocalInstallDir : appInBuildDir;