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

CMakePM: Set CMakePM project settings via CMakePresets's vendor field

Browse Source 
The field name is "qt.io/QtCreator/1.0":

```
  "vendor": {
    "qt.io/QtCreator/1.0": {
       "AskBeforePresetsReload": false,
       "AskReConfigureInitialParams": false,
       "AutorunCMake": false,
       "PackageManagerAutoSetup": false,
       "ShowAdvancedOptionsByDefault": true,
       "ShowSourceSubFolders": false,
       "UseJunctionsForSourceAndBuildDirectories": true
    }
  }
```

Fixes: QTCREATORBUG-25972
Fixes: QTCREATORBUG-29559
Fixes: QTCREATORBUG-30385
Change-Id: Ifac0d10eebda85f8d97e7a1387325a555101ea6d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2024-05-24 17:24:04 +02:00
parent fffa067a00
commit 1a5f61adca
4 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
View File

@@ -12,6 +12,7 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectimporter.h>
#include <projectexplorer/projectpanelfactory.h>
#include <utils/hostosinfo.h>
@@ -122,7 +123,13 @@ CMakeSpecificSettings::CMakeSpecificSettings(Project *p, bool autoApply)
if (project) {
// Re-read the settings. Reading in constructor is too early
connect(project, &Project::settingsLoaded, this, [this] {
connect(project, &Project::settingsLoaded, this, [this] { readSettings(); });
connect(project->projectImporter(), &ProjectImporter::cmakePresetsUpdated, this, [this] {
// clear settings first
Store data;
project->setNamedSettings(Constants::Settings::GENERAL_ID, variantFromStore(data));
readSettings();
});
}
@@ -133,9 +140,24 @@ void CMakeSpecificSettings::readSettings()
if (!project) {
AspectContainer::readSettings();
} else {
const Store data = storeFromVariant(project->namedSettings(Constants::Settings::GENERAL_ID));
useGlobalSettings = data.value(Constants::Settings::USE_GLOBAL_SETTINGS, true).toBool();
fromMap(data);
Store data = storeFromVariant(project->namedSettings(Constants::Settings::GENERAL_ID));
if (data.isEmpty()) {
CMakeProject *cmakeProject = static_cast<CMakeProject *>(project);
if (cmakeProject->presetsData().havePresets && cmakeProject->presetsData().vendor) {
useGlobalSettings = false;
data = storeFromMap(cmakeProject->presetsData().vendor.value());
fromMap(data);
// Write the new loaded CMakePresets settings into .user file
writeSettings();
} else {
useGlobalSettings = true;
AspectContainer::readSettings();
}
} else {
useGlobalSettings = data.value(Constants::Settings::USE_GLOBAL_SETTINGS, true).toBool();
fromMap(data);
}
}
}