Commit 3b9262cc authored by Alessandro Portale's avatar Alessandro Portale

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: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
parent 149642d6
......@@ -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>
......
......@@ -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 {
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
<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>
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment