Moved CMake settings page under Projects category

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -240,7 +240,7 @@ QString CMakeSettingsPage::findCmakeExecutable() const
 
 QString CMakeSettingsPage::id() const
 {
-    return QLatin1String("CMake");
+    return QLatin1String("Z.CMake");
 }
 
 QString CMakeSettingsPage::displayName() const
@@ -250,17 +250,17 @@ QString CMakeSettingsPage::displayName() const
 
 QString CMakeSettingsPage::category() const
 {
-    return QLatin1String("M.CMake");
+    return QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
 }
 
 QString CMakeSettingsPage::displayCategory() const
 {
-    return tr("CMake");
+    return tr(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY);
 }
 
 QIcon CMakeSettingsPage::categoryIcon() const
 {
-    return QIcon(); // TODO: Add CMake icon or move this into Projects category
+    return QIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));
 }
 
 QWidget *CMakeSettingsPage::createPage(QWidget *parent)

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -187,6 +187,7 @@ const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
 
 // settings page
 const char * const PROJECTEXPLORER_SETTINGS_CATEGORY  = "K.ProjectExplorer";
+const char * const PROJECTEXPLORER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("ProjectExplorer", "Projects");
 const char * const PROJECTEXPLORER_SETTINGS_CATEGORY_ICON  = ":/core/images/category_project.png";
 const char * const PROJECTEXPLORER_SETTINGS_ID = "ProjectExplorer.ProjectExplorer";
 

src/plugins/projectexplorer/projectexplorersettingspage.cpp

@@ -134,7 +134,7 @@ QString ProjectExplorerSettingsPage::category() const
 
 QString ProjectExplorerSettingsPage::displayCategory() const
 {
-    return tr("Projects");
+    return tr(Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY);
 }
 
 QIcon ProjectExplorerSettingsPage::categoryIcon() const