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

CMakePM: Remove per CMake tool "Auto Run" setting

Browse Source 
The setting is global for a few Qt Creator versions now, and it was
marked for removal in Qt Creator 13.

Change-Id: Ibca753b53a27ce89cba25a8c55c080e5597c4f57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Cristian Adam
2024-05-14 17:47:18 +02:00
parent f2d4fa794a
commit fa39d0490e
4 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -36,7 +36,6 @@ static Q_LOGGING_CATEGORY(cmakeToolLog, "qtc.cmake.tool", QtWarningMsg);
const char CMAKE_INFORMATION_ID[] = "Id"; const char CMAKE_INFORMATION_ID[] = "Id";
const char CMAKE_INFORMATION_COMMAND[] = "Binary"; const char CMAKE_INFORMATION_COMMAND[] = "Binary";
const char CMAKE_INFORMATION_DISPLAYNAME[] = "DisplayName"; const char CMAKE_INFORMATION_DISPLAYNAME[] = "DisplayName";
const char CMAKE_INFORMATION_AUTORUN[] = "AutoRun";
const char CMAKE_INFORMATION_QCH_FILE_PATH[] = "QchFile"; const char CMAKE_INFORMATION_QCH_FILE_PATH[] = "QchFile";
// obsolete since Qt Creator 5. Kept for backward compatibility // obsolete since Qt Creator 5. Kept for backward compatibility
const char CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY[] = "AutoCreateBuildDirectory"; 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))) Id::fromSetting(map.value(CMAKE_INFORMATION_ID)))
{ {
m_displayName = map.value(CMAKE_INFORMATION_DISPLAYNAME).toString(); 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_autoCreateBuildDirectory = map.value(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, false).toBool();
m_readerType = Internal::readerTypeFromString( m_readerType = Internal::readerTypeFromString(
map.value(CMAKE_INFORMATION_READERTYPE).toString()); 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_ID, m_id.toSetting());
data.insert(CMAKE_INFORMATION_COMMAND, m_executable.toString()); data.insert(CMAKE_INFORMATION_COMMAND, m_executable.toString());
data.insert(CMAKE_INFORMATION_QCH_FILE_PATH, m_qchFilePath.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); data.insert(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, m_autoCreateBuildDirectory);
if (m_readerType) if (m_readerType)
data.insert(CMAKE_INFORMATION_READERTYPE, data.insert(CMAKE_INFORMATION_READERTYPE,
@@ -233,11 +230,6 @@ FilePath CMakeTool::cmakeExecutable(const FilePath &path)
return resolvedPath; return resolvedPath;
} }
bool CMakeTool::isAutoRun() const
{
return m_isAutoRun;
}
QList<CMakeTool::Generator> CMakeTool::supportedGenerators() const QList<CMakeTool::Generator> CMakeTool::supportedGenerators() const
{ {
return isValid() ? m_introspection->m_generators : QList<CMakeTool::Generator>(); return isValid() ? m_introspection->m_generators : QList<CMakeTool::Generator>();

3
src/plugins/cmakeprojectmanager/cmaketool.h
View File

@@ -79,8 +79,6 @@ public:
Utils::Id id() const { return m_id; } Utils::Id id() const { return m_id; }
Utils::Store toMap () const; Utils::Store toMap () const;
void setAutorun(bool autoRun) { m_isAutoRun = autoRun; }
void setFilePath(const Utils::FilePath &executable); void setFilePath(const Utils::FilePath &executable);
Utils::FilePath filePath() const; Utils::FilePath filePath() const;
Utils::FilePath cmakeExecutable() const; Utils::FilePath cmakeExecutable() const;
@@ -130,7 +128,6 @@ private:
Utils::FilePath m_executable; Utils::FilePath m_executable;
Utils::FilePath m_qchFilePath; Utils::FilePath m_qchFilePath;
bool m_isAutoRun = true;
bool m_isAutoDetected = false; bool m_isAutoDetected = false;
QString m_detectionSource; QString m_detectionSource;
bool m_autoCreateBuildDirectory = false; bool m_autoCreateBuildDirectory = false;

9
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -342,15 +342,6 @@ void CMakeToolManager::restoreCMakeTools()
updateDocumentation(); updateDocumentation();
emit m_instance->cmakeToolsLoaded(); 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() void CMakeToolManager::updateDocumentation()

6
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -174,14 +174,8 @@ void CMakeToolSettingsAccessor::saveCMakeTools(const QList<CMakeTool *> &cmakeTo
data.insert(CMAKE_TOOL_DEFAULT_KEY, defaultId.toSetting()); data.insert(CMAKE_TOOL_DEFAULT_KEY, defaultId.toSetting());
int count = 0; int count = 0;
const bool autoRun = settings().autorunCMake();
for (CMakeTool *item : cmakeTools) { for (CMakeTool *item : cmakeTools) {
Utils::FilePath fi = item->cmakeExecutable(); 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 if (fi.needsDevice() || fi.isExecutableFile()) { // be graceful for device related stuff
Store tmp = item->toMap(); Store tmp = item->toMap();
if (tmp.isEmpty()) if (tmp.isEmpty())