From 87a93453981b72fb46a851ca40442bbaf55f3148 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 1 Jun 2023 18:28:57 +0200 Subject: [PATCH] CMakeProjectManager: Remove compatibility code with < 4.13 This hunk was added as part of 01b0d4f8f561 in 2020. Change-Id: I3b520005dc2462397ddfb1a2f6671603131ddced Reviewed-by: Cristian Adam --- .../cmakebuildconfiguration.cpp | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 5ddc68c1c23..a410881bacc 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1576,36 +1576,7 @@ QVariantMap CMakeBuildConfiguration::toMap() const bool CMakeBuildConfiguration::fromMap(const QVariantMap &map) { - if (!BuildConfiguration::fromMap(map)) - return false; - - const CMakeConfig conf - = Utils::filtered(Utils::transform(map.value(QLatin1String(CONFIGURATION_KEY)).toStringList(), - [](const QString &v) { return CMakeConfigItem::fromString(v); }), - [](const CMakeConfigItem &c) { return !c.isNull(); }); - - // TODO: Upgrade from Qt Creator < 4.13: Remove when no longer supported! - const QString buildTypeName = [this] { - switch (buildType()) { - case Debug: - return QString("Debug"); - case Profile: - return QString("RelWithDebInfo"); - case Release: - return QString("Release"); - case Unknown: - default: - return QString(""); - } - }(); - if (m_buildSystem->initialCMakeArguments().isEmpty()) { - CommandLine cmd = defaultInitialCMakeCommand(kit(), buildTypeName); - for (const CMakeConfigItem &item : conf) - cmd.addArg(item.toArgument(macroExpander())); - m_buildSystem->setInitialCMakeArguments(cmd.splitArguments()); - } - - return true; + return BuildConfiguration::fromMap(map); } FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFilePath,