Merge commit 'origin/1.3'

Conflicts:
	src/plugins/cpptools/cppcodecompletion.h
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qmleditor/QmlEditor.pluginspec

src/plugins/cpptools/cppcodecompletion.cpp

@@ -510,8 +510,11 @@ void CppQuickFixCollector::cleanup()
 CppCodeCompletion::CppCodeCompletion(CppModelManager *manager)
     : ICompletionCollector(manager),
       m_manager(manager),
+      m_editor(0),
+      m_startPosition(-1),
       m_caseSensitivity(Qt::CaseSensitive),
       m_autoInsertBrackets(true),
+      m_partialCompletionEnabled(true),
       m_forcedCompletion(false),
       m_completionOperator(T_EOF_SYMBOL),
       m_objcEnabled(true)

src/plugins/cpptools/cppcodecompletion.h

@@ -149,28 +149,26 @@ private:
 
     int findStartOfName(int pos = -1) const;
 
-    QList<TextEditor::CompletionItem> m_completions;
+private:
+    bool objcKeywordsWanted() const;
 
+    CppModelManager *m_manager;
     TextEditor::ITextEditable *m_editor;
     int m_startPosition;     // Position of the cursor from which completion started
 
-    CppModelManager *m_manager;
     Qt::CaseSensitivity m_caseSensitivity;
     bool m_autoInsertBrackets;
     bool m_partialCompletionEnabled;
-
     bool m_forcedCompletion;
+    unsigned m_completionOperator;
+    bool m_objcEnabled;
 
     CPlusPlus::Icons m_icons;
     CPlusPlus::Overview overview;
     CPlusPlus::TypeOfExpression typeOfExpression;
-
-    unsigned m_completionOperator;
-
     QPointer<FunctionArgumentWidget> m_functionArgumentWidget;
 
-    bool objcKeywordsWanted() const;
-    bool m_objcEnabled;
+    QList<TextEditor::CompletionItem> m_completions;
 };
 
 } // namespace Internal

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -165,7 +165,8 @@ class CheckDocument: protected ASTVisitor
 
 public:
     CheckDocument(Document::Ptr doc, Snapshot snapshot)
-        : ASTVisitor(doc->control()), _doc(doc), _snapshot(snapshot)
+        : ASTVisitor(doc->control()), _doc(doc), _snapshot(snapshot),
+          _line(0), _column(0)
     { }
 
     QList<QuickFixOperationPtr> operator()(QTextCursor tc)

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -89,7 +89,6 @@ protected:
     QTextCursor moveAtEndOfToken(unsigned index) const;
 
 private:
-    CPlusPlus::AST *_node;
     CPlusPlus::Document::Ptr _doc;
     CPlusPlus::Snapshot _snapshot;
     QTextCursor _textCursor;

src/plugins/cpptools/searchsymbols.h

@@ -51,6 +51,8 @@ struct ModelItemInfo
     enum ItemType { Enum, Class, Method, Declaration };
 
     ModelItemInfo()
+        : type(Declaration),
+          line(0)
     { }
 
     ModelItemInfo(const QString &symbolName,