diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index ffffded92c6..275e2f6dd66 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -73,7 +73,6 @@ images/category_cpaster.png images/category_cpp.png images/category_vcs.png - images/category_qml.png images/filtericon.png images/filtericon@2x.png images/category_buildrun.png diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 7ee8f2e42f2..0ba6a5e299c 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 884ad140faf..262abbd4fb6 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -33,6 +33,7 @@ #include "qmldesignerplugin.h" #include +#include #include @@ -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 c7804178d2f..925fb5117a0 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp @@ -31,6 +31,7 @@ #include "qmljseditorconstants.h" #include +#include #include #include @@ -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 similarity index 100% rename from src/plugins/coreplugin/images/category_qml.png rename to src/plugins/qmljstools/images/category_qml.png diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 16162c029fa..14a75894b5c 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -151,7 +151,7 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer + images/category_qml.png images/prompt.png images/collapse.png images/warning.png diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index b68acf1d634..b5de5aabb97 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