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

CMake: Remove legacy code from before version 3.7

Browse Source 
Change-Id: I8f8c0136548230e755a939d8c1bdfa78f5a644bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-06 09:28:56 +02:00
parent 94ef30125e
commit 70b8fa352a
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -73,7 +73,6 @@ Q_DECLARE_METATYPE(CMakeProjectManager::CMakeExtraBuildInfo)
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
const char INITIAL_ARGUMENTS[] = "CMakeProjectManager.CMakeBuildConfiguration.InitialArgument"; // Obsolete since QtC 3.7
const char CONFIGURATION_KEY[] = "CMake.Configuration"; const char CONFIGURATION_KEY[] = "CMake.Configuration";
CMakeBuildConfiguration::CMakeBuildConfiguration(Target *parent, Core::Id id) CMakeBuildConfiguration::CMakeBuildConfiguration(Target *parent, Core::Id id)
@@ -251,23 +250,7 @@ bool CMakeBuildConfiguration::fromMap(const QVariantMap &map)
[](const QString &v) { return CMakeConfigItem::fromString(v); }), [](const QString &v) { return CMakeConfigItem::fromString(v); }),
[](const CMakeConfigItem &c) { return !c.isNull(); }); [](const CMakeConfigItem &c) { return !c.isNull(); });
// Legacy (pre QtC 3.7): setConfigurationForCMake(conf);
const QStringList args = QtcProcess::splitArgs(map.value(QLatin1String(INITIAL_ARGUMENTS)).toString());
CMakeConfig legacyConf;
bool nextIsConfig = false;
foreach (const QString &a, args) {
if (a == QLatin1String("-D")) {
nextIsConfig = true;
continue;
}
if (!a.startsWith(QLatin1String("-D")))
continue;
legacyConf << CMakeConfigItem::fromString(nextIsConfig ? a : a.mid(2));
nextIsConfig = false;
}
// End Legacy
setConfigurationForCMake(legacyConf + conf);
return true; return true;
} }