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

doc/qtcreator.qdoc

@@ -53,6 +53,7 @@
        \o \l{Build Settings}
        \o \l{Qt Version Management}
        \o \l{Writing a Simple Program with Qt Creator}
+       \o \l{Qt Creator and Version Control Systems}
        \o \l{Navigating Quickly Around Your Code with Locator}
        \o \l{Debugging with Qt Creator}
        \o \l{Tips and Tricks}
@@ -846,7 +847,7 @@
     will be displayed.
 
     \image qtcreator-vcs-log.png
-    \image qtcreaotr-vcs-describe.png
+    \image qtcreator-vcs-describe.png
 
 
     \section2 Annotating Files
@@ -881,8 +882,18 @@
             \i  \gui{Stash}
             \i  Stash local changes prior to executing a \bold{pull}.
         \row
-            \i
+            \i  \gui{Pull}
-            \i
+            \i  Pull changes from the remote repository. If there are locally
+                modified files, you will be prompted to stash those changes.
+        \row
+            \i  \gui{Branches...}
+            \i  Displays the branch dialog showing the local branches at the
+                top and remote branches at the bottom. To switch to the local
+                branch, simply double-click on it. Double-clicking on a remote
+                branch will first create a local branch with the same name that
+                tracks the remote branch, and then switch to it.
+
+                \image qtcreator-vcs-gitbranch.png
     \endtable
 
 */

src/plugins/debugger/debuggermanager.cpp

@@ -94,7 +94,7 @@ DebuggerSettings::DebuggerSettings()
     m_skipKnownFrames = false;
     m_debugDumpers = false;
     m_useToolTips = false;
-    m_useToolTips = false;
+    m_useTerminal = false;
     m_useCustomDumpers = true;
 }
 

src/plugins/debugger/debuggermanager.h

@@ -200,6 +200,7 @@ public:
     bool m_debugDumpers;
     bool m_useFastStart;
     bool m_useToolTips;
+    bool m_useTerminal;
 
     QString m_scriptFile;
 };

src/plugins/debugger/debuggerplugin.cpp

@@ -277,6 +277,7 @@ QWidget *GdbOptionPage::createPage(QWidget *parent)
     m_ui.checkBoxUseCustomDumpers->setChecked(m_settings.m_useCustomDumpers);
     m_ui.checkBoxFastStart->setChecked(m_settings.m_useFastStart);
     m_ui.checkBoxUseToolTips->setChecked(m_settings.m_useToolTips);
+    m_ui.checkBoxUseTerminal->setChecked(m_settings.m_useTerminal);
 
 #ifndef QT_DEBUG
 #if 0
@@ -315,6 +316,7 @@ void GdbOptionPage::apply()
     m_settings.m_useCustomDumpers = m_ui.checkBoxUseCustomDumpers->isChecked();
     m_settings.m_useFastStart = m_ui.checkBoxFastStart->isChecked();
     m_settings.m_useToolTips = m_ui.checkBoxUseToolTips->isChecked();
+    m_settings.m_useTerminal = m_ui.checkBoxUseTerminal->isChecked();
 
     *m_plugin->m_manager->settings() = m_settings;
     m_plugin->writeSettings();
@@ -897,6 +899,7 @@ void DebuggerPlugin::writeSettings() const
 
     s->setValue("UseFastStart", m->m_useFastStart);
     s->setValue("UseToolTips", m->m_useToolTips);
+    s->setValue("UseTerminal", m->m_useTerminal);
     s->setValue("UseCustomDumpers", m->m_useCustomDumpers);
     s->setValue("SkipKnowFrames", m->m_skipKnownFrames);
     s->setValue("DebugDumpers", m->m_debugDumpers);
@@ -930,6 +933,7 @@ void DebuggerPlugin::readSettings()
     m->m_useCustomDumpers = s->value("UseCustomDupers", false).toBool();
     m->m_useFastStart = s->value("UseFastStart", false).toBool();
     m->m_useToolTips = s->value("UseToolTips", false).toBool();
+    m->m_useTerminal = s->value("UseTerminal", false).toBool();
     s->endGroup();
 
     m_manager->mainWindow()->restoreState(ba);

src/plugins/debugger/gdboptionpage.ui

@@ -84,6 +84,16 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="checkBoxUseTerminal">
+     <property name="toolTip">
+      <string>Start debugged process in a separte terminal.</string>
+     </property>
+     <property name="text">
+      <string>Start in terminal</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QCheckBox" name="checkBoxFastStart">
      <property name="toolTip">