Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d

src/plugins/gitlab/gitlaboptionspage.cpp

@@ -274,7 +274,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);
 }

src/plugins/gitlab/gitlaboptionspage.h

@@ -39,6 +39,10 @@ QT_END_NAMESPACE
 
 namespace GitLab {
 
+namespace Constants {
+const char GITLAB_SETTINGS[] = "GitLab";
+} // namespace Constants
+
 class GitLabServerWidget : public QWidget
 {
 public:

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);