Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1

6 files changed, 31 insertions, 15 deletions

diff --git a/doc/qtcreator-texteditor-completion.png b/doc/qtcreator-texteditor-completion.png
new file mode 100644
index 0000000000..b9affb2339
--- /dev/null
+++ b/doc/qtcreator-texteditor-completion.png
diff --git a/doc/qtcreator-texteditor-fonts.png b/doc/qtcreator-texteditor-fonts.png
new file mode 100644
index 0000000000..ae08dfe556
--- /dev/null
+++ b/doc/qtcreator-texteditor-fonts.png
diff --git a/doc/qtcreator-texteditor-general.png b/doc/qtcreator-texteditor-general.png
new file mode 100644
index 0000000000..c701efbd2d
--- /dev/null
+++ b/doc/qtcreator-texteditor-general.png
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index adca523a81..ac88edd455 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -215,8 +215,20 @@
 
     \title The Code Editor
 
-    ### SCREENSHOT of the editor in action
+    Qt Creator's code editor is designed to aid the developer to create, edit,
+    and navigate code. It is fully equipped with syntax highlighting, code
+    completion, context sensitive help, as well as inline error indicators
+    while you are typing. The screenshots below show the various dialogs within
+    which you can configure your editor.
 
+    \table
+        \row
+            \i  \inlineimage qtcreator-texteditor-general.png
+            \i  \inlineimage qtcreator-texteditor-fonts.png
+            \i  \inlineimage qtcreator-texteditor-completion.png
+    \endtable
+
+    The table below lists keyboard shortcuts supported by the code editor.
 
     \table
         \row
@@ -239,11 +251,20 @@
         \row
             \i  Indenting Blocks
             \i  Use \key{Ctrl+I}
+
+        \row
+            \i  Collapse
+            \i  Use \key{Ctrl+\<}
+
         \row
             \i  Commenting or uncommenting blocks
             \i  Use \key{Ctrl+\/}
 
         \row
+            \i  Delete a line
+            \i  Use \key{Shift+Del}
+
+        \row
             \i  Switch between header file and source file
             \i  Use \key{F4}.
 
@@ -256,19 +277,12 @@
             \i  Use \key{F2} and \key{Shift+F2}. This feature works with
                 namespaces, classes, methods, variables, include statements,
                 and macros.
-    \endtable
-
-
-    More:
-
-    Collapse
-
-    Up/Down/Page Up/Page Down - hold ctrl to prevent the cursor from moving
 
-
-
-    To switch to an external editor, select \gui{Open in external editor} from
-    the \gui{Edit -> Advanced} menu.
+        \row
+            \i  Switch to an external editor
+            \i  Select \gui{Open in external editor} from the
+                \gui{Edit -> Advanced} menu.
+    \endtable
 
 */
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 26d64fc240..fc33aa5e99 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -462,6 +462,7 @@ bool EditorManager::unregisterEditor(IEditor *editor)
     return false;
 }
 
+
 void EditorManager::updateCurrentEditorAndGroup(IContext *context)
 {
     if (debugEditorManager)
@@ -470,7 +471,8 @@ void EditorManager::updateCurrentEditorAndGroup(IContext *context)
     IEditor *editor = context ? qobject_cast<IEditor*>(context) : 0;
     if (groupContext) {
         m_d->m_splitter->setCurrentGroup(groupContext->editorGroup());
-        setCurrentEditor(0);
+        if (groupContext->editorGroup()->editorCount() == 0)
+            setCurrentEditor(0);
         updateActions();
     } else if (editor) {
         setCurrentEditor(editor);
diff --git a/tests/manual/cplusplus/cplusplus.pro b/tests/manual/cplusplus/cplusplus.pro
index 0d965b8ed0..11dd08f6fb 100644
--- a/tests/manual/cplusplus/cplusplus.pro
+++ b/tests/manual/cplusplus/cplusplus.pro
@@ -2,7 +2,7 @@ QT = core
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../shared/cplusplus/cplusplus.pri)
+include(../../../src/shared/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp