Merge branch 'origin/2.0' (early part)

diff --cc src/libs/cplusplus/MatchingText.cpp
Simple merge

diff --cc src/libs/cplusplus/MatchingText.h
index 8e42dc0,56d1db3..c4a84f7
--- 1/src/libs/cplusplus/MatchingText.h
--- 2/src/libs/cplusplus/MatchingText.h
+++ b/src/libs/cplusplus/MatchingText.h
@@@ -40,13 -39,13 +40,13 @@@ class TokenCache
  class CPLUSPLUS_EXPORT MatchingText
  {
  public:
 -    MatchingText();
 +    MatchingText(TokenCache *tokenCache);
  
      static bool shouldInsertMatchingText(const QTextCursor &tc);
-     static bool shouldInsertMatchingText(const QChar &lookAhead);
+     static bool shouldInsertMatchingText(QChar lookAhead);
  
      QString insertMatchingBrace(const QTextCursor &tc, const QString &text,
-                                 const QChar &la, int *skippedChars) const;
+                                 QChar la, int *skippedChars) const;
      QString insertParagraphSeparator(const QTextCursor &tc) const;
  
  private:

diff --cc src/plugins/cppeditor/cppeditor.cpp
index 1485969,1b4e59c..f68f328
--- 1/src/plugins/cppeditor/cppeditor.cpp
--- 2/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@@ -1392,9 -1559,9 +1392,9 @@@ bool CPPEditor::isElectricCharacter(QCh
  }
  
  QString CPPEditor::insertMatchingBrace(const QTextCursor &tc, const QString &text,
-                                        const QChar &la, int *skippedChars) const
+                                        QChar la, int *skippedChars) const
  {
 -    MatchingText m;
 +    MatchingText m(tokenCache());
      return m.insertMatchingBrace(tc, text, la, skippedChars);
  }
  

diff --cc src/plugins/cppeditor/cppeditor.h
Simple merge

diff --cc src/plugins/help/helpplugin.cpp
Simple merge

diff --cc src/plugins/help/helpviewer_qwv.cpp
Simple merge

diff --cc src/plugins/qmljseditor/qmljscodecompletion.cpp
Simple merge

diff --cc src/plugins/qmljseditor/qmljscodecompletion.h
index ae3eb8b,283b376..0cae652
--- 1/src/plugins/qmljseditor/qmljscodecompletion.h
--- 2/src/plugins/qmljseditor/qmljscodecompletion.h
+++ b/src/plugins/qmljseditor/qmljscodecompletion.h
@@@ -78,17 -78,14 +78,17 @@@ private
      void updateSnippets();
  
      bool maybeTriggersCompletion(TextEditor::ITextEditable *editor);
-     bool isDelimiter(const QChar &ch) const;
+     bool isDelimiter(QChar ch) const;
  
      void addCompletions(const QHash<QString, const QmlJS::Interpreter::Value *> &newCompletions,
 -                        const QIcon &icon);
 +                        const QIcon &icon, int relevance);
      void addCompletions(const QStringList &newCompletions,
 -                        const QIcon &icon);
 +                        const QIcon &icon, int relevance);
 +    void addCompletionsPropertyLhs(
 +            const QHash<QString, const QmlJS::Interpreter::Value *> &newCompletions,
 +            const QIcon &icon, int relevance);
  
 -    ModelManagerInterface *m_modelManager;
 +    QmlJS::ModelManagerInterface *m_modelManager;
      TextEditor::ITextEditable *m_editor;
      int m_startPosition;
      QList<TextEditor::CompletionItem> m_completions;

diff --cc src/plugins/qmljseditor/qmljseditor.cpp
Simple merge

diff --cc src/plugins/qmljseditor/qmljseditor.h
Simple merge

diff --cc src/plugins/texteditor/basetexteditor.cpp
Simple merge

diff --cc src/plugins/texteditor/basetexteditor.h
Simple merge