feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJsTools: Move category_qml from Core to QmlJsTools

Browse Source 
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:
Alessandro Portale
2014-06-02 16:50:01 +02:00
parent 149642d600
commit 3b9262ccbd
8 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
View File

@@ -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()