From 9f21358cbe249050984d9ab3641836abc26eda1c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 22 Mar 2018 15:27:55 +0100 Subject: [PATCH] CMake: Remove code that is obsolete since QtC 3.7 Saved data has changed in QtCreator 3.7, remove compatibility code. Change-Id: I27e1f163f905b5f8fd105f3cdeaf047777a1c06c Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 04cda446554..8e8e56be1e9 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -62,7 +62,6 @@ using namespace CMakeProjectManager::Internal; using namespace ProjectExplorer; namespace { -const char CLEAN_KEY[] = "CMakeProjectManager.MakeStep.Clean"; // Obsolete since QtC 3.7 const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets"; const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments"; const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument"; @@ -140,14 +139,10 @@ QVariantMap CMakeBuildStep::toMap() const bool CMakeBuildStep::fromMap(const QVariantMap &map) { - if (map.value(CLEAN_KEY, false).toBool()) { - m_buildTarget = CMakeBuildStep::cleanTarget(); - } else { - const QStringList targetList = map.value(BUILD_TARGETS_KEY).toStringList(); - if (!targetList.isEmpty()) - m_buildTarget = targetList.last(); - m_toolArguments = map.value(TOOL_ARGUMENTS_KEY).toString(); - } + const QStringList targetList = map.value(BUILD_TARGETS_KEY).toStringList(); + if (!targetList.isEmpty()) + m_buildTarget = targetList.last(); + m_toolArguments = map.value(TOOL_ARGUMENTS_KEY).toString(); if (map.value(ADD_RUNCONFIGURATION_ARGUMENT_KEY, false).toBool()) m_buildTarget = ADD_RUNCONFIGURATION_TEXT;