diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
| commit | 99b2eb1ca9f0515681bf949db0ab6650f857e82b (patch) | |
| tree | 730a84b76b55e623ec331940631e247f55cc39df /src/plugins/qmljstools | |
| parent | 7a107e7d004610ee8332b122aeb8993e61056b23 (diff) | |
| parent | e1aa32225865980992e79c53fdf3b40e0fcd0a86 (diff) | |
| download | qt-creator-99b2eb1ca9f0515681bf949db0ab6650f857e82b.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
doc/src/debugger/qtquick-debugger-example.qdoc
Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolssettings.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljstoolssettings.cpp b/src/plugins/qmljstools/qmljstoolssettings.cpp index 46159d467b..388a120ad4 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.cpp +++ b/src/plugins/qmljstools/qmljstoolssettings.cpp @@ -159,6 +159,11 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent) QmlJSToolsSettings::~QmlJSToolsSettings() { + TextEditor::TextEditorSettings *textEditorSettings = TextEditor::TextEditorSettings::instance(); + textEditorSettings->unregisterCodeStyle(QmlJSTools::Constants::QML_JS_SETTINGS_ID); + textEditorSettings->unregisterCodeStylePool(QmlJSTools::Constants::QML_JS_SETTINGS_ID); + textEditorSettings->unregisterCodeStyleFactory(QmlJSTools::Constants::QML_JS_SETTINGS_ID); + delete m_globalCodeStyle; m_globalCodeStyle = 0; } |