forked from qt-creator/qt-creator
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>
This commit is contained in:
BIN
src/plugins/qmljstools/images/category_qml.png
Normal file
BIN
src/plugins/qmljstools/images/category_qml.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 876 B |
@@ -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()
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user