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

Mercurial: Fix saving of settings

Browse Source 
Fixes: QTCREATORBUG-27091
Change-Id: I59297993f19c60a9eaf67910638818ffd17b4ff8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-02-21 11:27:53 +01:00
parent 6104806208
commit 3eac52dc7d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/dialogs/ioptionspage.h
View File

@@ -83,13 +83,16 @@ protected:
void setSettings(Utils::AspectContainer *settings); void setSettings(Utils::AspectContainer *settings);
void setLayouter(const std::function<void(QWidget *w)> &layouter); void setLayouter(const std::function<void(QWidget *w)> &layouter);
// Used in FontSettingsPage. FIXME?
QPointer<QWidget> m_widget; // Used in conjunction with m_widgetCreator
private:
Utils::Id m_id; Utils::Id m_id;
Utils::Id m_category; Utils::Id m_category;
QString m_displayName; QString m_displayName;
QString m_displayCategory; QString m_displayCategory;
Utils::Icon m_categoryIcon; Utils::Icon m_categoryIcon;
WidgetCreator m_widgetCreator; WidgetCreator m_widgetCreator;
QPointer<QWidget> m_widget; // Used in conjunction with m_widgetCreator
mutable bool m_keywordsInitialized = false; mutable bool m_keywordsInitialized = false;
mutable QStringList m_keywords; mutable QStringList m_keywords;

2
src/plugins/mercurial/mercurialsettings.cpp
View File

@@ -73,7 +73,7 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
setId(VcsBase::Constants::VCS_ID_MERCURIAL); setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(MercurialSettings::tr("Mercurial")); setDisplayName(MercurialSettings::tr("Mercurial"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setSettings(m_settings); setSettings(settings);
setLayouter([settings](QWidget *widget) { setLayouter([settings](QWidget *widget) {
MercurialSettings &s = *settings; MercurialSettings &s = *settings;