diff options
author | Jarek Kobus <jkobus@trolltech.com> | 2011-05-25 08:50:01 +0200 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-25 09:41:35 +0200 |
commit | 934a8238d4937f5bcf1dd22692c07d455af34506 (patch) | |
tree | 02d5719b6bb7955e69756714bceb6a753a49420c /src/plugins/qmljstools/qmljstoolsplugin.cpp | |
parent | f950b8d7c7812c7a5916676fbd5f9c2edf61118f (diff) | |
download | qt-creator-934a8238d4937f5bcf1dd22692c07d455af34506.tar.gz |
Implement qml tab settings
Change-Id: I0b7365b5b3d7538f2b4a8c5eaff3420f448dd5be
Reviewed-on: http://codereview.qt.nokia.com/99
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')
-rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 322070c93e..5e750bc8e8 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -36,9 +36,12 @@ #include "qmljslocatordata.h" #include "qmljscodestylesettingspage.h" #include "qmljstoolsconstants.h" +#include "qmljstoolssettings.h" +#include "qmljscodestylesettingsfactory.h" #include <texteditor/texteditorsettings.h> #include <texteditor/tabsettings.h> +#include <texteditor/codestylepreferencesmanager.h> #include <extensionsystem/pluginmanager.h> @@ -74,6 +77,8 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) Q_UNUSED(error) // Core::ICore *core = Core::ICore::instance(); + m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings + // Objects m_modelManager = new ModelManager(this); // Core::VCSManager *vcsManager = core->vcsManager(); @@ -87,7 +92,10 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) LocatorData *locatorData = new LocatorData; addAutoReleasedObject(locatorData); addAutoReleasedObject(new FunctionFilter(locatorData)); -// addAutoReleasedObject(new QmlJSCodeStyleSettingsPage); + addAutoReleasedObject(new QmlJSCodeStyleSettingsPage); + + TextEditor::CodeStylePreferencesManager::instance()->registerFactory( + new QmlJSTools::QmlJSCodeStylePreferencesFactory()); return true; } |