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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
This commit is contained in:
Eike Ziller
2014-05-20 14:44:31 +02:00
parent 049a10fa40 88d76de059
commit 270e8fe537
12 changed files with 87 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/texteditor/plaintexteditor.cpp
View File

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