diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
| commit | c868b9f3ed1bbd499195e158f44cb51f093a0177 (patch) | |
| tree | dc1fcae11aa4c66bc17fa359299196652b9f2e8d /src/plugins/cpptools/baseeditordocumentprocessor.cpp | |
| parent | 2ffe1ac68f878011cad534cffe0e983b428f6f14 (diff) | |
| parent | e873f872ef2a2ba1342dd013ab2e184e6676a71a (diff) | |
| download | qt-creator-c868b9f3ed1bbd499195e158f44cb51f093a0177.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentprocessor.cpp')
| -rw-r--r-- | src/plugins/cpptools/baseeditordocumentprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index 182261686f..ec1a9a9617 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -118,7 +118,7 @@ QList<QTextEdit::ExtraSelection> BaseEditorDocumentProcessor::toTextEditorSelect } void BaseEditorDocumentProcessor::runParser(QFutureInterface<void> &future, - BaseEditorDocumentParser *parser, + BaseEditorDocumentParser::Ptr parser, BaseEditorDocumentParser::InMemoryInfo info) { future.setProgressRange(0, 1); |