Merge remote-tracking branch 'origin/3.6'

Conflicts:
	src/plugins/projectexplorer/toolchainmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304

1 files changed, 96 insertions, 0 deletions

diff --git a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h
new file mode 100644
index 0000000000..f63bfa2c5a
--- /dev/null
+++ b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company.  For licensing terms and
+** conditions see http://www.qt.io/terms-conditions.  For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H
+#define CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H
+
+#include <clangcodemodel/clangcompletionassistinterface.h>
+
+#include <cplusplus/Token.h>
+
+#include <QTextCursor>
+
+QT_BEGIN_NAMESPACE
+class QTextDocument;
+QT_END_NAMESPACE
+
+namespace ClangCodeModel {
+namespace Internal {
+
+class ActivationSequenceContextProcessor
+{
+public:
+    ActivationSequenceContextProcessor(const ClangCompletionAssistInterface *assistInterface);
+
+    CPlusPlus::Kind completionKind() const;
+    int startOfNamePosition() const;   // e.g. points to 'b' in "foo.bar<CURSOR>"
+    int operatorStartPosition() const; // e.g. points to '.' for "foo.bar<CURSOR>"
+
+    const QTextCursor &textCursor_forTestOnly() const;
+
+    static int findStartOfName(const TextEditor::AssistInterface *assistInterface,
+                               int startPosition);
+    static int skipPrecedingWhitespace(const TextEditor::AssistInterface *assistInterface,
+                                       int startPosition);
+
+protected:
+    void process();
+    void goBackToStartOfName();
+    void processActivationSequence();
+    void processStringLiteral();
+    void processComma();
+    void generateTokens();
+    void processDoxygenComment();
+    void processComment();
+    void processInclude();
+    void processSlashOutsideOfAString();
+    void processLeftParen();
+    void processPreprocessorInclude();
+    void resetPositionsForEOFCompletionKind();
+
+    bool isCompletionKindStringLiteralOrSlash() const;
+    bool isProbablyPreprocessorIncludeDirective() const;
+
+private:
+    QVector<CPlusPlus::Token> m_tokens;
+    QTextCursor m_textCursor;
+    CPlusPlus::Token m_token;
+    const ClangCompletionAssistInterface *m_assistInterface;
+    int m_tokenIndex;
+    const int m_positionInDocument;
+    int m_startOfNamePosition;
+    int m_operatorStartPosition;
+    CPlusPlus::Kind m_completionKind;
+};
+
+} // namespace Internal
+} // namespace ClangCodeModel
+
+#endif // CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H