Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Conflicts:
	src/plugins/perforce/perforceplugin.cpp

diff --cc src/plugins/coreplugin/coreplugin.pro
Simple merge

diff --cc src/plugins/coreplugin/editormanager/editormanager.cpp
Simple merge

diff --cc src/plugins/coreplugin/editormanager/editorsplitter.cpp
Simple merge

diff --cc src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 9af2376,a7119c7..0877c99
--- 1/src/plugins/coreplugin/editormanager/openeditorsview.cpp
--- 2/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@@ -120,10 -223,8 +120,9 @@@ void OpenEditorsWidget::closeEditors(
      core->fileManager()->saveModifiedFiles(selectedFiles, &cancelled);
      if (cancelled)
          return;
-     core->editorManager()->
-             closeEditors(selectedEditors);
+     core->editorManager()->closeEditors(selectedEditors);
      updateEditorList();
 +    */
  }
  
  void OpenEditorsWidget::closeAllEditors()

diff --cc src/plugins/coreplugin/mainwindow.cpp
Simple merge

diff --cc src/plugins/coreplugin/outputpane.cpp
Simple merge

diff --cc src/plugins/perforce/perforceplugin.cpp
index cb93d8e,7d126c4..b17cb7e
--- 1/src/plugins/perforce/perforceplugin.cpp
--- 2/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@@ -889,8 -889,8 +889,8 @@@ void PerforcePlugin::p4Diff(const QStri
              diffname = fi.fileName();
          }
  
-         foreach (Core::IEditor *ed, Core::ICore::instance()->editorManager()->openedEditors()) {
+         foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors()) {
 -            if (ed->property("originalFileName").toString() == fileName) {
 +            if (ed->file()->property("originalFileName").toString() == fileName) {
                  existingEditor = ed;
                  displayInEditor = false;
                  break;

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

diff --cc src/plugins/projectexplorer/projecttreewidget.cpp
Simple merge