From 173363b6161811a912f627315dddc528b7a61920 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 8 Jul 2022 10:48:04 +0200 Subject: [PATCH] Meson: Fix settings saving Amends c24291648b4a98bda35a48594b6b4dfd51098b15 Change-Id: I0f80e1483c0550d7ec3add0f9869eb96c758052b Reviewed-by: hjk --- src/plugins/mesonprojectmanager/mesonprojectplugin.cpp | 2 ++ .../mesonprojectmanager/settings/general/settings.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp index b12fa8591e7..ddfa6e4df04 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp @@ -84,6 +84,7 @@ private: void saveAll() { 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(Constants::Project::MIMETYPE); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build"); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt"); + Settings::instance()->readSettings(ICore::settings()); return true; } diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.cpp b/src/plugins/mesonprojectmanager/settings/general/settings.cpp index 03a9ed293a4..694f8b063bb 100644 --- a/src/plugins/mesonprojectmanager/settings/general/settings.cpp +++ b/src/plugins/mesonprojectmanager/settings/general/settings.cpp @@ -41,9 +41,12 @@ Settings::Settings() autorunMeson.setLabelText(tr("Autorun Meson")); autorunMeson.setToolTip(tr("Automatically run Meson when needed.")); - verboseNinja.setSettingsKey("meson.autorun"); + verboseNinja.setSettingsKey("ninja.verbose"); verboseNinja.setLabelText(tr("Ninja verbose mode")); verboseNinja.setToolTip(tr("Enables verbose mode by default when invoking Ninja.")); + + registerAspect(&autorunMeson); + registerAspect(&verboseNinja); } Settings *Settings::instance()