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

doc/qtcreator.qdoc

@@ -881,8 +881,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/qt4projectmanager/qt4nodes.cpp

@@ -730,9 +730,7 @@ namespace {
 // updateSourceFiles() for files that changed
 // It does so by storing a modification time for each ui file we know about.
 
-// TODO this function should also be called if the build configuration changes
+// TODO this function should also be called if the build directory is changed
-// since the build directory could change, and thus the generated files that are present
-// TODO check that it works
 void Qt4ProFileNode::updateUiFiles()
 {
     // Only those two project types can have ui files for us