Merge remote-tracking branch 'origin/8.0'

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

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d

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

src/plugins/todo/optionsdialog.cpp

@@ -26,8 +26,9 @@
 
 #include "optionsdialog.h"
 
-#include "keyworddialog.h"
+#include "constants.h"
 #include "keyword.h"
+#include "keyworddialog.h"
 #include "settings.h"
 #include "todotr.h"
 
@@ -267,7 +268,7 @@ void OptionsDialog::apply()
 
 TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function<void ()> &onApply)
 {
-    setId("TodoSettings");
+    setId(Constants::TODO_SETTINGS);
     setDisplayName(Tr::tr("To-Do"));
     setCategory("To-Do");
     setDisplayCategory(Tr::tr("To-Do"));

src/plugins/todo/todoprojectsettingswidget.cpp

@@ -71,8 +71,11 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p
     }.attachTo(this);
 
     setExcludedPatternsButtonsEnabled();
-    connect(addExcludedPatternButton, &QPushButton::clicked,
-            this, &TodoProjectSettingsWidget::addExcludedPatternButtonClicked);
+    setGlobalSettingsId(Constants::TODO_SETTINGS);
+    connect(addExcludedPatternButton,
+            &QPushButton::clicked,
+            this,
+            &TodoProjectSettingsWidget::addExcludedPatternButtonClicked);
     connect(m_removeExcludedPatternButton, &QPushButton::clicked,
             this, &TodoProjectSettingsWidget::removeExcludedPatternButtonClicked);
     connect(m_excludedPatternsList, &QListWidget::itemChanged,