Merge "Merge remote-tracking branch 'origin/4.6'"

1 files changed, 14 insertions, 0 deletions

diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h
index b3f96d466d..d799c636b2 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -32,6 +32,7 @@
 #include "cpptools_global.h"
 
 #include <texteditor/codeassist/assistinterface.h>
+#include <texteditor/helpitem.h>
 #include <texteditor/quickfix.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>
@@ -48,6 +49,18 @@ class TextDocument;
 
 namespace CppTools {
 
+// For clang code model only, move?
+struct CPPTOOLS_EXPORT ToolTipInfo {
+    QString text;
+    QString briefComment;
+
+    QStringList qDocIdCandidates;
+    QString qDocMark;
+    TextEditor::HelpItem::Category qDocCategory;
+
+    QString sizeInBytes;
+};
+
 class CPPTOOLS_EXPORT BaseEditorDocumentProcessor : public QObject
 {
     Q_OBJECT
@@ -78,6 +91,7 @@ public:
     virtual QFuture<CursorInfo> cursorInfo(const CursorInfoParams &params) = 0;
     virtual QFuture<CursorInfo> requestLocalReferences(const QTextCursor &cursor) = 0;
     virtual QFuture<SymbolInfo> requestFollowSymbol(int line, int column) = 0;
+    virtual QFuture<ToolTipInfo> toolTipInfo(const QByteArray &codecName, int line, int column);
 
 public:
     using HeaderErrorDiagnosticWidgetCreator = std::function<QWidget*()>;