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

Meson: Fix settings saving

Browse Source 
Amends c24291648b

Change-Id: I0f80e1483c0550d7ec3add0f9869eb96c758052b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-07-08 10:48:04 +02:00
parent c4b02fab05
commit 173363b616
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
View File

@@ -84,6 +84,7 @@ private:
void saveAll() void saveAll()
{ {
m_toolsSettings.saveMesonTools(MesonTools::tools(), ICore::dialogParent()); m_toolsSettings.saveMesonTools(MesonTools::tools(), ICore::dialogParent());
Settings::instance()->writeSettings(ICore::settings());
} }
}; };
@@ -101,6 +102,7 @@ bool MesonProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
ProjectManager::registerProjectType<MesonProject>(Constants::Project::MIMETYPE); ProjectManager::registerProjectType<MesonProject>(Constants::Project::MIMETYPE);
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build"); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build");
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt"); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt");
Settings::instance()->readSettings(ICore::settings());
return true; return true;
} }

5
src/plugins/mesonprojectmanager/settings/general/settings.cpp
View File

@@ -41,9 +41,12 @@ Settings::Settings()
autorunMeson.setLabelText(tr("Autorun Meson")); autorunMeson.setLabelText(tr("Autorun Meson"));
autorunMeson.setToolTip(tr("Automatically run Meson when needed.")); autorunMeson.setToolTip(tr("Automatically run Meson when needed."));
verboseNinja.setSettingsKey("meson.autorun"); verboseNinja.setSettingsKey("ninja.verbose");
verboseNinja.setLabelText(tr("Ninja verbose mode")); verboseNinja.setLabelText(tr("Ninja verbose mode"));
verboseNinja.setToolTip(tr("Enables verbose mode by default when invoking Ninja.")); verboseNinja.setToolTip(tr("Enables verbose mode by default when invoking Ninja."));
registerAspect(&autorunMeson);
registerAspect(&verboseNinja);
} }
Settings *Settings::instance() Settings *Settings::instance()