aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-10-08 14:34:26 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-10-10 07:42:18 +0000
commitd56e88d36a09989ed572781ecca224cd31635d5d (patch)
tree6deb589492a4ad9f4974da105d15b81cb85e147c /src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
parent2896e5f5e289a30928ab679c99d7de68d4a903ac (diff)
RemoteLinux: Fix look-up of remote file path in deployment data
If the deployment configuration contains an "install into temp dir" step, then the local file paths of the binaries built by the build tool will not be in the list of deployable files, because all deployables come from the temporary install dir. Therefore, look for just a file name match as a fallback. Fixes: QTCREATORBUG-21235 Change-Id: Ie3fad515515b4f28cc6bdef1254f4c05a0557569 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index f7cfa7f33f..d782c26d4e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -237,7 +237,7 @@ DeploymentData CMakeBuildConfiguration::deploymentData() const
for (const CMakeBuildTarget &ct : m_buildTargets) {
if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType) {
if (!ct.executable.isEmpty()
- && !result.deployableForLocalFile(ct.executable.toString()).isValid()) {
+ && result.deployableForLocalFile(ct.executable.toString()).localFilePath() != ct.executable) {
result.addFile(ct.executable.toString(),
deploymentPrefix + buildDir.relativeFilePath(ct.executable.toFileInfo().dir().path()),
DeployableFile::TypeExecutable);