diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 08:40:59 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-17 08:40:59 +0000 |
| commit | d6ee830ec183f60c66823374669ee0326c9ec9b9 (patch) | |
| tree | 2bfcc777ad86bd361dd88429ba349caaae5e2646 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 507e2b99cb49b60e805e266f4f2f7cf6da150ebe (diff) | |
| parent | 115afed94b8e85db29b0c057e7c143a3d053d6cc (diff) | |
| download | qt-creator-d6ee830ec183f60c66823374669ee0326c9ec9b9.tar.gz | |
Merge "Merge remote-tracking branch 'origin/4.6'"
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index ad255459b2..f1b1d2c2bd 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -1293,10 +1293,15 @@ CppCompletionAssistProvider *CppModelManager::completionAssistProvider() const return d->m_activeModelManagerSupport->completionAssistProvider(); } -BaseEditorDocumentProcessor *CppModelManager::editorDocumentProcessor( - TextEditor::TextDocument *baseTextDocument) const +TextEditor::BaseHoverHandler *CppModelManager::createHoverHandler() const { - return d->m_activeModelManagerSupport->editorDocumentProcessor(baseTextDocument); + return d->m_activeModelManagerSupport->createHoverHandler(); +} + +BaseEditorDocumentProcessor *CppModelManager::createEditorDocumentProcessor( + TextEditor::TextDocument *baseTextDocument) const +{ + return d->m_activeModelManagerSupport->createEditorDocumentProcessor(baseTextDocument); } void CppModelManager::setIndexingSupport(CppIndexingSupport *indexingSupport) |