Merge remote-tracking branch 'origin/2.6'

2012-08-02 07:41:18 +02:00
parent 7e7460ad33 ee8e1122ba
commit d9f8a25f80
188 changed files with 2930 additions and 4166 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -73,11 +73,6 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
    return ret->editor();
 }

-Core::Context CMakeEditor::context() const
-{
-    return Core::Context(Constants::C_CMAKEEDITOR);
-}
-
 Core::Id CMakeEditor::id() const
 {
    return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;