aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-07-13 09:04:49 +0200
committerEike Ziller <eike.ziller@qt.io>2022-07-13 07:19:27 +0000
commit11b0cab178e0d549d925acda08dad4575aa7e4e4 (patch)
tree11369df7fa046b1fe2e2ccc5de2c94ff4e68b250
parente5906945cefadbe120f0588198a4f237f04b5709 (diff)
Project settings: Fix missing IDs for global settings links
Change-Id: Id99bf5f9d45dd399c589011ca724914046305c53 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/gitlab/gitlaboptionspage.cpp2
-rw-r--r--src/plugins/gitlab/gitlaboptionspage.h4
-rw-r--r--src/plugins/gitlab/gitlabprojectsettings.cpp1
-rw-r--r--src/plugins/todo/constants.h2
-rw-r--r--src/plugins/todo/optionsdialog.cpp2
-rw-r--r--src/plugins/todo/todoprojectsettingswidget.cpp1
6 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp
index 5687eb9ec8..131fe6ec03 100644
--- a/src/plugins/gitlab/gitlaboptionspage.cpp
+++ b/src/plugins/gitlab/gitlaboptionspage.cpp
@@ -279,7 +279,7 @@ GitLabOptionsPage::GitLabOptionsPage(GitLabParameters *p, QObject *parent)
: Core::IOptionsPage{parent}
, m_parameters(p)
{
- setId("GitLab");
+ setId(Constants::GITLAB_SETTINGS);
setDisplayName(tr("GitLab"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
}
diff --git a/src/plugins/gitlab/gitlaboptionspage.h b/src/plugins/gitlab/gitlaboptionspage.h
index 4d89b20b00..3992d7228b 100644
--- a/src/plugins/gitlab/gitlaboptionspage.h
+++ b/src/plugins/gitlab/gitlaboptionspage.h
@@ -40,6 +40,10 @@ QT_END_NAMESPACE
namespace GitLab {
+namespace Constants {
+const char GITLAB_SETTINGS[] = "GitLab";
+} // namespace Constants
+
class GitLabServerWidget : public QWidget
{
public:
diff --git a/src/plugins/gitlab/gitlabprojectsettings.cpp b/src/plugins/gitlab/gitlabprojectsettings.cpp
index 35419ca667..519073b8dd 100644
--- a/src/plugins/gitlab/gitlabprojectsettings.cpp
+++ b/src/plugins/gitlab/gitlabprojectsettings.cpp
@@ -136,6 +136,7 @@ GitLabProjectSettingsWidget::GitLabProjectSettingsWidget(ProjectExplorer::Projec
{
setUseGlobalSettingsCheckBoxVisible(false);
setUseGlobalSettingsLabelVisible(true);
+ setGlobalSettingsId(Constants::GITLAB_SETTINGS);
// setup ui
auto verticalLayout = new QVBoxLayout(this);
verticalLayout->setContentsMargins(0, 0, 0, 0);
diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h
index 4b396eb726..db55309ad0 100644
--- a/src/plugins/todo/constants.h
+++ b/src/plugins/todo/constants.h
@@ -31,6 +31,8 @@
namespace Todo {
namespace Constants {
+const char TODO_SETTINGS[] = "TodoSettings";
+
// Settings entries
const char SETTINGS_GROUP[] = "TodoPlugin";
const char SCANNING_SCOPE[] = "ScanningScope";
diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp
index dc4f2d1d94..7dbcb14556 100644
--- a/src/plugins/todo/optionsdialog.cpp
+++ b/src/plugins/todo/optionsdialog.cpp
@@ -212,7 +212,7 @@ void OptionsDialog::apply()
TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function<void ()> &onApply)
{
- setId("TodoSettings");
+ setId(Constants::TODO_SETTINGS);
setDisplayName(OptionsDialog::tr("To-Do"));
setCategory("To-Do");
setDisplayCategory(OptionsDialog::tr("To-Do"));
diff --git a/src/plugins/todo/todoprojectsettingswidget.cpp b/src/plugins/todo/todoprojectsettingswidget.cpp
index d2dbbd5aa5..b8b934ecec 100644
--- a/src/plugins/todo/todoprojectsettingswidget.cpp
+++ b/src/plugins/todo/todoprojectsettingswidget.cpp
@@ -44,6 +44,7 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p
ui->setupUi(this);
setExcludedPatternsButtonsEnabled();
+ setGlobalSettingsId(Constants::TODO_SETTINGS);
connect(ui->addExcludedPatternButton, &QPushButton::clicked,
this, &TodoProjectSettingsWidget::addExcludedPatternButtonClicked);
connect(ui->removeExcludedPatternButton, &QPushButton::clicked,