feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Fix the paths of non-installed executables

Browse Source 
... in run configurations. One check was missing.
This amends c6cd9e8fbe.

Change-Id: If398a719adbb5a5c2a527b70d274751ada91abe4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2018-05-07 10:44:18 +02:00
parent 8b452b28d2
commit b36965776c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -130,6 +130,8 @@ Utils::FileName QbsRunConfiguration::executableToRun(const BuildTargetInfo &targ
return appInBuildDir; return appInBuildDir;
const QString deployedAppFilePath = target()->deploymentData() const QString deployedAppFilePath = target()->deploymentData()
.deployableForLocalFile(appInBuildDir.toString()).remoteFilePath(); .deployableForLocalFile(appInBuildDir.toString()).remoteFilePath();
if (deployedAppFilePath.isEmpty())
return appInBuildDir;
const FileName appInLocalInstallDir = target()->deploymentData().localInstallRoot() const FileName appInLocalInstallDir = target()->deploymentData().localInstallRoot()
+ deployedAppFilePath; + deployedAppFilePath;
return appInLocalInstallDir.exists() ? appInLocalInstallDir : appInBuildDir; return appInLocalInstallDir.exists() ? appInLocalInstallDir : appInBuildDir;