Merge remote-tracking branch 'origin/2.6'

2012-08-06 16:19:35 +02:00
parent da3e3200af d6f9ac1a12
commit efefa2eb17
209 changed files with 973 additions and 664 deletions
--- a/src/plugins/cpptools/cppcodegen_test.cpp
+++ b/src/plugins/cpptools/cppcodegen_test.cpp
@@ -46,7 +46,7 @@
 #include <utils/fileutils.h>

 #include <QtTest>
-#include <QtDebug>
+#include <QDebug>
 #include <QTextDocument>
 #include <QDir>

--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -53,7 +53,7 @@
 #include <utils/fileutils.h>

 #include <QtTest>
-#include <QtDebug>
+#include <QDebug>
 #include <QTextDocument>
 #include <QDir>

--- a/src/plugins/cpptools/cppcompletionassistprovider.cpp
+++ b/src/plugins/cpptools/cppcompletionassistprovider.cpp
@@ -42,7 +42,7 @@ using namespace CppTools;
 // ---------------------------
 bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
 {
-    return editorId == Core::Id(CppEditor::Constants::CPPEDITOR_ID);
+    return editorId == CppEditor::Constants::CPPEDITOR_ID;
 }

 int CppCompletionAssistProvider::activationCharSequenceLength() const