QtSupport: Remove dependency on CppTools

It was only left for the C++ category for the Qt class generation
settings.

Change-Id: I22d3f198f7b825c4a36d08d4ee28091b9e5b1f43
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/plugins/cpptools/CMakeLists.txt

@@ -69,7 +69,6 @@ add_qtc_plugin(CppTools
     cppsemanticinfoupdater.cpp cppsemanticinfoupdater.h
     cppsourceprocessor.cpp cppsourceprocessor.h
     cppsymbolinfo.h
-    cpptools.qrc
     cpptools_clangtidychecks.h
     cpptools_clazychecks.h
     cpptools_global.h

src/plugins/cpptools/cppcodemodelsettingspage.cpp

@@ -190,8 +190,9 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe
     setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME));
     setCategory(Constants::CPP_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CppTools", "C++"));
-    setCategoryIcon(Utils::Icon({{":/cpptools/images/settingscategory_cpp.png",
+    setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_cpp.png",
-                    Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint));
+                                  Utils::Theme::PanelTextColorDark}},
+                                Utils::Icon::Tint));
 }
 
 QWidget *CppCodeModelSettingsPage::widget()

src/plugins/cpptools/cpptools.pro

@@ -223,6 +223,3 @@ equals(TEST, 1) {
 
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
-RESOURCES += \
-    cpptools.qrc

src/plugins/cpptools/cpptools.qbs

@@ -153,7 +153,6 @@ Project {
             "cppsemanticinfoupdater.h",
             "cppsourceprocessor.cpp",
             "cppsourceprocessor.h",
-            "cpptools.qrc",
             "cpptools_clangtidychecks.h",
             "cpptools_clazychecks.h",
             "cpptools_global.h",

src/plugins/cpptools/cpptools.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/cpptools">
-        <file>images/settingscategory_cpp.png</file>
-        <file>images/settingscategory_cpp@2x.png</file>
-    </qresource>
-</RCC>

src/plugins/projectexplorer/projectexplorer.qrc

@@ -85,5 +85,7 @@
         <file>images/settingscategory_devices@2x.png</file>
         <file>images/settingscategory_kits.png</file>
         <file>images/settingscategory_kits@2x.png</file>
+        <file>images/settingscategory_cpp.png</file>
+        <file>images/settingscategory_cpp@2x.png</file>
     </qresource>
 </RCC>

src/plugins/qtsupport/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_qtc_plugin(QtSupport
   DEPENDS Qt5::Xml
   PUBLIC_DEPENDS ProParser
-  PLUGIN_DEPENDS Core CppTools ProjectExplorer ResourceEditor
+  PLUGIN_DEPENDS Core ProjectExplorer ResourceEditor
   SOURCES
     baseqtversion.cpp baseqtversion.h
     codegenerator.cpp codegenerator.h

src/plugins/qtsupport/codegensettingspage.cpp

@@ -94,6 +94,11 @@ CodeGenSettingsPage::CodeGenSettingsPage()
     setId(Constants::CODEGEN_SETTINGS_PAGE_ID);
     setDisplayName(QCoreApplication::translate("QtSupport", "Qt Class Generation"));
     setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY);
+    setDisplayCategory(
+        QCoreApplication::translate("CppTools", CppTools::Constants::CPP_SETTINGS_NAME));
+    setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_cpp.png",
+                                  Utils::Theme::PanelTextColorDark}},
+                                Utils::Icon::Tint));
 }
 
 QWidget *CodeGenSettingsPage::widget()

src/plugins/qtsupport/qtsupport.qbs

@@ -13,7 +13,6 @@ Project {
         Depends { name: "ProParser" }
         Depends { name: "ProjectExplorer" }
         Depends { name: "ResourceEditor" }
-        Depends { name: "CppTools" }
 
         cpp.defines: base.concat([
             "QMAKE_LIBRARY",

src/plugins/qtsupport/qtsupport_dependencies.pri

@@ -4,7 +4,6 @@ QTC_LIB_DEPENDS += \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
-    cpptools \
     projectexplorer \
     resourceeditor
 DEFINES *= \