summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/servermodereader.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2019-05-23 15:26:40 +0200
committerChristian Stenger <christian.stenger@qt.io>2019-05-27 11:35:52 +0000
commit411678048daf045648fbecf4f9e1eff2d0c5c20f (patch)
tree0a03896affefcdbb26df3c81bed0245d68b7f975 /src/plugins/cmakeprojectmanager/servermodereader.cpp
parent84b34a41e736c272caa0adf56aed11d14b825d61 (diff)
downloadqt-creator-411678048daf045648fbecf4f9e1eff2d0c5c20f.tar.gz
CMake: Set the correct build system target to the project part
The internal build target key had changed again. Adapt and use a more error proof pattern to be hopefully safe if it may change again. The wrong build target key led inside the AutoTest plugin to a wrong comparison of build target of the project parts vs. the build target of the run configuration which in turn ended up in always deducing the run configuration for the test runner. Change-Id: I32df578df85cc0206c2b8fdac00acc3a798f0d73 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/servermodereader.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/servermodereader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index e63243f887..dba909b478 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -382,7 +382,7 @@ CppTools::RawProjectParts ServerModeReader::createRawProjectParts() const
CppTools::RawProjectPart rpp;
rpp.setProjectFileLocation(fg->target->sourceDirectory.toString() + "/CMakeLists.txt");
- rpp.setBuildSystemTarget(fg->target->name + QChar('\n') + fg->target->sourceDirectory.toString() + QChar('/'));
+ rpp.setBuildSystemTarget(CMakeTargetNode::generateId(fg->target->sourceDirectory, fg->target->name));
rpp.setDisplayName(fg->target->name + QString::number(counter));
rpp.setMacros(fg->macros);
rpp.setIncludePaths(includes);