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

CMake: Remove code that is obsolete since QtC 3.7

Browse Source 
Saved data has changed in QtCreator 3.7, remove compatibility code.

Change-Id: I27e1f163f905b5f8fd105f3cdeaf047777a1c06c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2018-03-22 15:27:55 +01:00
parent 8e90ce7e01
commit 9f21358cbe
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -62,7 +62,6 @@ using namespace CMakeProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace { namespace {
const char CLEAN_KEY[] = "CMakeProjectManager.MakeStep.Clean"; // Obsolete since QtC 3.7
const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets"; const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments"; const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments";
const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument"; const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument";
@@ -140,14 +139,10 @@ QVariantMap CMakeBuildStep::toMap() const
bool CMakeBuildStep::fromMap(const QVariantMap &map) bool CMakeBuildStep::fromMap(const QVariantMap &map)
{ {
if (map.value(CLEAN_KEY, false).toBool()) { const QStringList targetList = map.value(BUILD_TARGETS_KEY).toStringList();
m_buildTarget = CMakeBuildStep::cleanTarget(); if (!targetList.isEmpty())
} else { m_buildTarget = targetList.last();
const QStringList targetList = map.value(BUILD_TARGETS_KEY).toStringList(); m_toolArguments = map.value(TOOL_ARGUMENTS_KEY).toString();
if (!targetList.isEmpty())
m_buildTarget = targetList.last();
m_toolArguments = map.value(TOOL_ARGUMENTS_KEY).toString();
}
if (map.value(ADD_RUNCONFIGURATION_ARGUMENT_KEY, false).toBool()) if (map.value(ADD_RUNCONFIGURATION_ARGUMENT_KEY, false).toBool())
m_buildTarget = ADD_RUNCONFIGURATION_TEXT; m_buildTarget = ADD_RUNCONFIGURATION_TEXT;