Settings: Regroup all Devices-related configuration pages

Each kind of Device used to add its own top-level preference page, with only a single
tab in each, which makes the list of categories almost irrelevant.

Regrouping all these under the 'Devices' category makes the settings page much more
consistent and reduces the clutter.

Change-Id: I72c04b57004c2e1b1f57208bdaabe8b944390558
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp
index 84e103deb07..e3d5bc19e3f 100644
--- a/src/plugins/ios/iossettingspage.cpp
+++ b/src/plugins/ios/iossettingspage.cpp
@@ -28,6 +28,8 @@
 #include "iossettingswidget.h"
 #include "iosconstants.h"
 
+#include <projectexplorer/projectexplorerconstants.h>
+
 #include <QCoreApplication>
 
 namespace Ios {
@@ -37,11 +39,10 @@ IosSettingsPage::IosSettingsPage(QObject *parent)
     : Core::IOptionsPage(parent)
 {
     setId(Constants::IOS_SETTINGS_ID);
-    setDisplayName(tr("iOS Configurations"));
-    setCategory(Constants::IOS_SETTINGS_CATEGORY);
-    setDisplayCategory(QCoreApplication::translate("iOS",
-        Constants::IOS_SETTINGS_TR_CATEGORY));
-    setCategoryIcon(Utils::Icon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)));
+    setDisplayName(tr("iOS"));
+    setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
+    setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
+                                       ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY));
 }
 
 QWidget *IosSettingsPage::widget()