diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-20 14:44:31 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-20 14:44:31 +0200 |
| commit | 270e8fe537ccde8b2047ba58113d034bcc6e4d39 (patch) | |
| tree | 0057bf6460b8ed3f94689defa8e7476351054a20 /src/plugins/texteditor/plaintexteditor.cpp | |
| parent | 049a10fa4055da4c56cca5fe028fec4405fce933 (diff) | |
| parent | 88d76de059389382d1f8e8c4ddedd497f2760d61 (diff) | |
| download | qt-creator-270e8fe537ccde8b2047ba58113d034bcc6e4d39.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/ios/iosdeploystep.cpp
Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
Diffstat (limited to 'src/plugins/texteditor/plaintexteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/plaintexteditor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index ce3cb99007..a66a042075 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -132,6 +132,7 @@ void PlainTextEditorWidget::configure(const QString &mimeType) void PlainTextEditorWidget::configure(const MimeType &mimeType) { Highlighter *highlighter = new Highlighter(); + highlighter->setTabSettings(baseTextDocument()->tabSettings()); baseTextDocument()->setSyntaxHighlighter(highlighter); setCodeFoldingSupported(false); |