Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b

1 files changed, 20 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.h b/src/plugins/cpptools/cppcompletionassistprocessor.h
index 49634539ce..6db68e1a1a 100644
--- a/src/plugins/cpptools/cppcompletionassistprocessor.h
+++ b/src/plugins/cpptools/cppcompletionassistprocessor.h
@@ -32,6 +32,16 @@
 
 #include <cplusplus/Icons.h>
 
+#include <functional>
+
+QT_BEGIN_NAMESPACE
+class QTextDocument;
+QT_END_NAMESPACE
+
+namespace CPlusPlus {
+struct LanguageFeatures;
+}
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -42,6 +52,16 @@ public:
 protected:
     void addSnippets();
 
+    using DotAtIncludeCompletionHandler = std::function<void(int &startPosition, unsigned *kind)>;
+    static void startOfOperator(QTextDocument *textDocument,
+                                int positionInDocument,
+                                unsigned *kind,
+                                int &start,
+                                const CPlusPlus::LanguageFeatures &languageFeatures,
+                                bool adjustForQt5SignalSlotCompletion = false,
+                                DotAtIncludeCompletionHandler dotAtIncludeCompletionHandler
+                                    = DotAtIncludeCompletionHandler());
+
     int m_positionForProposal;
     QList<TextEditor::AssistProposalItemInterface *> m_completions;
     QStringList m_preprocessorCompletions;