diff options
author | hjk <hjk121@nokiamail.com> | 2014-08-20 23:04:08 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@digia.com> | 2014-08-21 07:36:17 +0200 |
commit | ba5124052456601e0942a3c4ac48bfe1623c58f0 (patch) | |
tree | b5934839d961c20e16a70bb09b918563d61b432b /src/plugins/texteditor/snippets/snippetssettingspage.cpp | |
parent | 208865dd0a711919b27c93e45ee19b6e71cd7a31 (diff) | |
download | qt-creator-ba5124052456601e0942a3c4ac48bfe1623c58f0.tar.gz |
TextEditor: Fix snippet editor crash introduced in d85a4f615
The SnippetEditorWidget setup is unusual as it doesn't have
an associated SnippetEditorFactory/SnippetEditor creation chain
and requires manual intervention. This was lost in the
conversion to the new construction scheme.
Change-Id: I0919295603432e525c2abd0da762acc8207f996c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/texteditor/snippets/snippetssettingspage.cpp')
-rw-r--r-- | src/plugins/texteditor/snippets/snippetssettingspage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index b9f3d47eca..f10b67ab48 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -36,6 +36,7 @@ #include "ui_snippetssettingspage.h" #include <coreplugin/icore.h> +#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> #include <extensionsystem/pluginmanager.h> #include <utils/headerviewstretcher.h> @@ -336,7 +337,6 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w) foreach (ISnippetProvider *provider, providers) { m_ui.groupCombo->addItem(provider->displayName(), provider->groupId()); SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w); - snippetEditor->textDocument()->setFontSettings(TextEditorSettings::fontSettings()); provider->decorateEditor(snippetEditor); m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor); connect(snippetEditor, SIGNAL(snippetContentChanged()), this, SLOT(setSnippetContent())); |