diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-17 13:02:43 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-17 13:11:09 +0000 |
| commit | 139196b93c4818d0fd944863944babeec85af1bf (patch) | |
| tree | 96634b3a66580c57d636df86003f4e47bd514406 /src/plugins/projectexplorer/target.cpp | |
| parent | bfc65cee9803b6efd859455833aecac01286d852 (diff) | |
Fix restoring cmake run configurationsv4.11.0-beta1
Amends 5bcd59c94f.
Fixes: QTCREATORBUG-22932
Change-Id: I46b42f0e15eaf1fe4bd2f1ea4a87286ee68cfee8
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/target.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/target.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index b9f92741d2b..ecddc0d9779 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -867,7 +867,10 @@ bool Target::fromMap(const QVariantMap &map) RunConfiguration *rc = RunConfigurationFactory::restore(this, valueMap); if (!rc) continue; - QTC_CHECK(rc->id().withSuffix(rc->buildKey()) == ProjectExplorer::idFromMap(valueMap)); + const Core::Id theIdFromMap = ProjectExplorer::idFromMap(valueMap); + if (!theIdFromMap.toString().contains("///::///")) { // Hack for cmake 4.10 -> 4.11 + QTC_CHECK(rc->id().withSuffix(rc->buildKey()) == theIdFromMap); + } addRunConfiguration(rc); if (i == activeConfiguration) setActiveRunConfiguration(rc); |