diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index cd0e59b016e..6c989ccad45 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -83,13 +83,16 @@ protected: void setSettings(Utils::AspectContainer *settings); void setLayouter(const std::function &layouter); + // Used in FontSettingsPage. FIXME? + QPointer m_widget; // Used in conjunction with m_widgetCreator + +private: Utils::Id m_id; Utils::Id m_category; QString m_displayName; QString m_displayCategory; Utils::Icon m_categoryIcon; WidgetCreator m_widgetCreator; - QPointer m_widget; // Used in conjunction with m_widgetCreator mutable bool m_keywordsInitialized = false; mutable QStringList m_keywords; diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp index 94734464828..018f6594e16 100644 --- a/src/plugins/mercurial/mercurialsettings.cpp +++ b/src/plugins/mercurial/mercurialsettings.cpp @@ -73,7 +73,7 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings) setId(VcsBase::Constants::VCS_ID_MERCURIAL); setDisplayName(MercurialSettings::tr("Mercurial")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); - setSettings(m_settings); + setSettings(settings); setLayouter([settings](QWidget *widget) { MercurialSettings &s = *settings;