diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 4cb638659a1..444ff299f9a 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -36,7 +36,6 @@ static Q_LOGGING_CATEGORY(cmakeToolLog, "qtc.cmake.tool", QtWarningMsg); const char CMAKE_INFORMATION_ID[] = "Id"; const char CMAKE_INFORMATION_COMMAND[] = "Binary"; const char CMAKE_INFORMATION_DISPLAYNAME[] = "DisplayName"; -const char CMAKE_INFORMATION_AUTORUN[] = "AutoRun"; const char CMAKE_INFORMATION_QCH_FILE_PATH[] = "QchFile"; // obsolete since Qt Creator 5. Kept for backward compatibility const char CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY[] = "AutoCreateBuildDirectory"; @@ -113,7 +112,6 @@ CMakeTool::CMakeTool(const Store &map, bool fromSdk) : Id::fromSetting(map.value(CMAKE_INFORMATION_ID))) { m_displayName = map.value(CMAKE_INFORMATION_DISPLAYNAME).toString(); - m_isAutoRun = map.value(CMAKE_INFORMATION_AUTORUN, true).toBool(); m_autoCreateBuildDirectory = map.value(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, false).toBool(); m_readerType = Internal::readerTypeFromString( map.value(CMAKE_INFORMATION_READERTYPE).toString()); @@ -183,7 +181,6 @@ Store CMakeTool::toMap() const data.insert(CMAKE_INFORMATION_ID, m_id.toSetting()); data.insert(CMAKE_INFORMATION_COMMAND, m_executable.toString()); data.insert(CMAKE_INFORMATION_QCH_FILE_PATH, m_qchFilePath.toString()); - data.insert(CMAKE_INFORMATION_AUTORUN, m_isAutoRun); data.insert(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, m_autoCreateBuildDirectory); if (m_readerType) data.insert(CMAKE_INFORMATION_READERTYPE, @@ -233,11 +230,6 @@ FilePath CMakeTool::cmakeExecutable(const FilePath &path) return resolvedPath; } -bool CMakeTool::isAutoRun() const -{ - return m_isAutoRun; -} - QList CMakeTool::supportedGenerators() const { return isValid() ? m_introspection->m_generators : QList(); diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h index cf13ad49c5b..51012e699c2 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.h +++ b/src/plugins/cmakeprojectmanager/cmaketool.h @@ -79,8 +79,6 @@ public: Utils::Id id() const { return m_id; } Utils::Store toMap () const; - void setAutorun(bool autoRun) { m_isAutoRun = autoRun; } - void setFilePath(const Utils::FilePath &executable); Utils::FilePath filePath() const; Utils::FilePath cmakeExecutable() const; @@ -130,7 +128,6 @@ private: Utils::FilePath m_executable; Utils::FilePath m_qchFilePath; - bool m_isAutoRun = true; bool m_isAutoDetected = false; QString m_detectionSource; bool m_autoCreateBuildDirectory = false; diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp index e20c3c58eba..40f7430b4a7 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp @@ -342,15 +342,6 @@ void CMakeToolManager::restoreCMakeTools() updateDocumentation(); emit m_instance->cmakeToolsLoaded(); - - // Store the default CMake tool "Autorun CMake" value globally - // TODO: Remove in Qt Creator 13 - Internal::CMakeSpecificSettings &s = Internal::settings(); - if (s.autorunCMake() == s.autorunCMake.defaultValue()) { - CMakeTool *cmake = defaultCMakeTool(); - s.autorunCMake.setValue(cmake ? cmake->isAutoRun() : true); - s.writeSettings(); - } } void CMakeToolManager::updateDocumentation() diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index b877998a079..e8e5a8a64ea 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -174,14 +174,8 @@ void CMakeToolSettingsAccessor::saveCMakeTools(const QList &cmakeTo data.insert(CMAKE_TOOL_DEFAULT_KEY, defaultId.toSetting()); int count = 0; - const bool autoRun = settings().autorunCMake(); for (CMakeTool *item : cmakeTools) { Utils::FilePath fi = item->cmakeExecutable(); - - // Gobal Autorun value will be set for all tools - // TODO: Remove in Qt Creator 13 - item->setAutorun(autoRun); - if (fi.needsDevice() || fi.isExecutableFile()) { // be graceful for device related stuff Store tmp = item->toMap(); if (tmp.isEmpty())