diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-06-20 14:03:40 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-06-20 14:41:04 +0000 |
commit | 5bcd59c94f75e1dfbc64827328e110d0071364c4 (patch) | |
tree | af3e16d6b8050b2b72a3c6427ba95a1b0f3c1b62 /src/plugins/cmakeprojectmanager/projecttreehelper.cpp | |
parent | add60c014871bdae0a038398695425a347b44952 (diff) |
CMake: Simplify buildkey generation
Just use the target name as buildkey. This is unique in cmake projects, so
there is no need to mangle the source directory into the whole thing.
This is a problem since different readers might report different source
directories. That will then result in RunConfigurations getting duplicated
after switching the reader types.
Task-number: QTCREATORBUG-22129
Change-Id: I849ab68f221d732341e98faa9a4e757d3a495b2a
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/projecttreehelper.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/projecttreehelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp index 58b2f744e8d..ab9c49acdfb 100644 --- a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp +++ b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp @@ -160,7 +160,7 @@ CMakeTargetNode *createTargetNode(const QHash<Utils::FilePath, ProjectNode *> &c ProjectNode *cmln = cmakeListsNodes.value(dir); QTC_ASSERT(cmln, return nullptr); - QString targetId = CMakeTargetNode::generateId(dir, displayName); + QString targetId = displayName; CMakeTargetNode *tn = static_cast<CMakeTargetNode *>( cmln->findNode([&targetId](const Node *n) { return n->buildKey() == targetId; })); |