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

8 files changed, 31 insertions, 16 deletions

diff --git a/dist/changes-1.1.0 b/dist/changes-1.1.0
index 080f66fbfeb..6d21c37185e 100644
--- a/dist/changes-1.1.0
+++ b/dist/changes-1.1.0
@@ -65,7 +65,9 @@ Mac
    * Open in Finder action in project tree.
 
 Linux
-   * Don't crash because of incompatible libQt3Support.
+   * Don't crash because of incompatible libQt3Support:
+     Provide a wrapper script and ship libQt3Support.
+     (Fixes crashes e.g. in file dialogs on openSUSE 11.1)
 
 
 Lots of improvements to
@@ -76,4 +78,4 @@ Lots of improvements to
 
 Additional credits go to:
    * Martin Aumueller <aumuell@reserv.at> (FakeVim improvements)
-   * Kris Wong (different patches)
+   * Kris Wong (various patches)
diff --git a/doc/images/qtcreator-cmake-build-settings.png b/doc/images/qtcreator-cmake-build-settings.png
new file mode 100644
index 00000000000..d1db5840083
--- /dev/null
+++ b/doc/images/qtcreator-cmake-build-settings.png
diff --git a/doc/images/qtcreator-cmake-import-wizard1.png b/doc/images/qtcreator-cmake-import-wizard1.png
new file mode 100644
index 00000000000..1d473d3e541
--- /dev/null
+++ b/doc/images/qtcreator-cmake-import-wizard1.png
diff --git a/doc/images/qtcreator-cmake-import-wizard2.png b/doc/images/qtcreator-cmake-import-wizard2.png
new file mode 100644
index 00000000000..c9b8d3703cb
--- /dev/null
+++ b/doc/images/qtcreator-cmake-import-wizard2.png
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 9ae007d3bd2..095ea399f77 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1172,14 +1172,13 @@
 
     \section1 Debugging Helper Library
 
-    While debugging Qt Creator dynamically loads a helper library into
-    your program. This helper library enables Qt Creator to pretty print
-    Qt and STL types. The Qt SDK package already contains a prebuilt
-    debugging helper library. To create a debugging helper library
-    select the \{Options} from the \gui{Tools} menu, and go to the
-    \gui{Qt/Qt Versions} pane. As the internal layout of qt can
-    change between versions, the debugging helper library is build
-    per Qt Version.
+    While debugging Qt Creator dynamically loads a helper library into your
+    program. This helper library enables Qt Creator to pretty print Qt and STL
+    types. The Qt SDK package already contains a prebuilt debugging helper
+    library. To create a debugging helper library, select the \gui{Options}
+    from the \gui{Tools} menu, and go to the \gui{Qt/Qt Versions} pane. As the
+    internal layout of qt can change between versions, the debugging helper
+    library is built for each Qt version.
 
 
     \section1 A Walkthrough for the Debugger Frontend
@@ -1274,10 +1273,12 @@
     not have an in-place build, Qt Creator lets you specify the directory in
     which the project is built (shadow build).
 
+    \image qtcreator-cmake-import-wizard1.png
+
     The screenshot below shows how you can specify command line arguments to
     \c CMake for your project.
 
-     ###TODO one, two pictures ? \image qtcreator-import-wizard.png
+    \image qtcreator-cmake-import-wizard2.png
 
     Normally, there is no need to pass any command line arguments for projects
     that are already built, as \c CMake caches that information.
@@ -1292,7 +1293,7 @@
     By default Qt Creator builds the "all" target. You can change which
     targets get build in the Project/Build Settings.
 
-    ### \image qtcreator-build-settings.png
+    \image qtcreator-cmake-build-settings.png
 
     Currently only one build configuration is supported and the
     build directory can't be changed after the initial import. This
@@ -1597,10 +1598,6 @@
            paths may fail. For example, remounting parts of a file system
            using the --bind mount option.
 
-        \o Running Qt Creator on Windows with 16 bit color depth results in
-           black icons and possible crashes. This was fixed in an updated
-           version released 05 March 2009.
-
         \o There is no syntax highlighting for \c CMake project files.
 
         \o Project files included from \c{CMakeLists.txt} are not shown in the
diff --git a/share/qtcreator/gdbmacros/gdbmacros.pro b/share/qtcreator/gdbmacros/gdbmacros.pro
index bd1c07b9686..00c7b2403c8 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/gdbmacros/gdbmacros.pro
@@ -1,3 +1,7 @@
 TEMPLATE = lib
 CONFIG += shared
+linux-* {
+CONFIG -= release
+CONFIG += debug
+}
 SOURCES=gdbmacros.cpp
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 7edd516cafe..ee0c58e0a4c 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -334,31 +334,41 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_splitAction = new QAction(tr("Split"), this);
     cmd = am->registerAction(m_d->m_splitAction, Constants::SPLIT, editManagerContext);
+#ifndef Q_OS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,2")));
+#endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
     connect(m_d->m_splitAction, SIGNAL(triggered()), this, SLOT(split()));
 
     m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
     cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
+#ifndef Q_OS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,3")));
+#endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
     connect(m_d->m_splitSideBySideAction, SIGNAL(triggered()), this, SLOT(splitSideBySide()));
 
     m_d->m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
     cmd = am->registerAction(m_d->m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
+#ifndef Q_OS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,0")));
+#endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
     connect(m_d->m_removeCurrentSplitAction, SIGNAL(triggered()), this, SLOT(removeCurrentSplit()));
 
     m_d->m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
     cmd = am->registerAction(m_d->m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
+#ifndef Q_OS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,1")));
+#endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
     connect(m_d->m_removeAllSplitsAction, SIGNAL(triggered()), this, SLOT(removeAllSplits()));
 
     m_d->m_gotoOtherSplitAction = new QAction(tr("Goto Other Split"), this);
     cmd = am->registerAction(m_d->m_gotoOtherSplitAction, Constants::GOTO_OTHER_SPLIT, editManagerContext);
+#ifndef Q_OS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,o")));
+#endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
     connect(m_d->m_gotoOtherSplitAction, SIGNAL(triggered()), this, SLOT(gotoOtherSplit()));
 
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index e18599d7072..4ecf1290678 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1096,6 +1096,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         m_mode = InsertMode;
         moveToEndOfLine();
         m_lastInsertion.clear();
+    } else if (key == control('a')) {
+        // FIXME: eat it to prevent the global "select all" shortcut to trigger
     } else if (key == 'b') {
         m_moveType = MoveExclusive;
         moveToWordBoundary(false, false);