QmlJsTools: Move category_qml from Core to QmlJsTools

It is qml specific, and only used in qml plugins.

Alsoe, SETTINGS_CATEGORY_QML_ICON was defined in
qmldesignerconstants.h and other plugins included that
header. This contradicts the plugin dependecies
too much.

Change-Id: I76f31cd01bc9c02faf914051cae8bac7d7bac659
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

8 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index ffffded92c..275e2f6dd6 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -73,7 +73,6 @@
         <file>images/category_cpaster.png</file>
         <file>images/category_cpp.png</file>
         <file>images/category_vcs.png</file>
-        <file>images/category_qml.png</file>
         <file>images/filtericon.png</file>
         <file>images/filtericon@2x.png</file>
         <file>images/category_buildrun.png</file>
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index 7ee8f2e42f..0ba6a5e299 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -65,8 +65,6 @@ const char QML_WARNIN_FOR_DESIGNER_FEATURES_IN_EDITOR_KEY[] = "WarnAboutQtQuickD
 const char QML_SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView";
 const char QML_ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView";
 
-const char SETTINGS_CATEGORY_QML_ICON[] = ":/core/images/category_qml.png";
-
 const char QML_DESIGNER_SUBFOLDER[] = "/designer/";
 
 namespace Internal {
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 884ad140fa..262abbd4fb 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -33,6 +33,7 @@
 #include "qmldesignerplugin.h"
 
 #include <qmljseditor/qmljseditorconstants.h>
+#include <qmljstools/qmljstoolsconstants.h>
 
 #include <QTextStream>
 
@@ -87,7 +88,7 @@ SettingsPage::SettingsPage() :
     setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
     setDisplayCategory(QCoreApplication::translate("QmlJSEditor",
         QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML));
-    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_QML_ICON));
+    setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON));
 }
 
 QWidget *SettingsPage::widget()
diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
index c7804178d2..925fb5117a 100644
--- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
+++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
@@ -31,6 +31,7 @@
 #include "qmljseditorconstants.h"
 
 #include <qmldesigner/qmldesignerconstants.h>
+#include <qmljstools/qmljstoolsconstants.h>
 #include <coreplugin/icore.h>
 
 #include <QSettings>
@@ -116,7 +117,7 @@ QuickToolBarSettingsPage::QuickToolBarSettingsPage() :
     setCategory(Constants::SETTINGS_CATEGORY_QML);
     setDisplayCategory(QCoreApplication::translate("QmlJSEditor",
         QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML));
-    setCategoryIcon(QLatin1String(QmlDesigner::Constants::SETTINGS_CATEGORY_QML_ICON));
+    setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON));
 }
 
 QWidget *QuickToolBarSettingsPage::widget()
diff --git a/src/plugins/coreplugin/images/category_qml.png b/src/plugins/qmljstools/images/category_qml.png
index 131a4b381e..131a4b381e 100644
--- a/src/plugins/coreplugin/images/category_qml.png
+++ b/src/plugins/qmljstools/images/category_qml.png
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 16162c029f..14a75894b5 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -151,7 +151,7 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileS
     setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME));
     setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
     setDisplayCategory(QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML));
-    setCategoryIcon(QLatin1String(QmlDesigner::Constants::SETTINGS_CATEGORY_QML_ICON));
+    setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON));
 }
 
 QWidget *QmlJSCodeStyleSettingsPage::widget()
diff --git a/src/plugins/qmljstools/qmljstools.qrc b/src/plugins/qmljstools/qmljstools.qrc
index ab7f6f798c..124a396169 100644
--- a/src/plugins/qmljstools/qmljstools.qrc
+++ b/src/plugins/qmljstools/qmljstools.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/qmljstools">
+        <file>images/category_qml.png</file>
         <file>images/prompt.png</file>
         <file>images/collapse.png</file>
         <file>images/warning.png</file>
diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h
index b68acf1d63..b5de5aabb9 100644
--- a/src/plugins/qmljstools/qmljstoolsconstants.h
+++ b/src/plugins/qmljstools/qmljstoolsconstants.h
@@ -51,6 +51,8 @@ const char QML_JS_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Qt Quick");
 const char M_TOOLS_QMLJS[] = "QmlJSTools.Tools.Menu";
 const char RESET_CODEMODEL[] = "QmlJSTools.ResetCodeModel";
 
+const char SETTINGS_CATEGORY_QML_ICON[] = ":/qmljstools/images/category_qml.png";
+
 } // namespace Constants
 } // namespace QmlJSTools