diff --git a/doc/qtcreator-vcs-annotate.png b/doc/qtcreator-vcs-annotate.png new file mode 100644 index 00000000000..87b7ed11735 Binary files /dev/null and b/doc/qtcreator-vcs-annotate.png differ diff --git a/doc/qtcreator-vcs-commit.png b/doc/qtcreator-vcs-commit.png new file mode 100644 index 00000000000..2c58ad57732 Binary files /dev/null and b/doc/qtcreator-vcs-commit.png differ diff --git a/doc/qtcreator-vcs-describe.png b/doc/qtcreator-vcs-describe.png new file mode 100644 index 00000000000..d0949b1e59e Binary files /dev/null and b/doc/qtcreator-vcs-describe.png differ diff --git a/doc/qtcreator-vcs-diff.png b/doc/qtcreator-vcs-diff.png new file mode 100644 index 00000000000..fdb9a0f5da8 Binary files /dev/null and b/doc/qtcreator-vcs-diff.png differ diff --git a/doc/qtcreator-vcs-gitbranch.png b/doc/qtcreator-vcs-gitbranch.png new file mode 100644 index 00000000000..398de10ee65 Binary files /dev/null and b/doc/qtcreator-vcs-gitbranch.png differ diff --git a/doc/qtcreator-vcs-log.png b/doc/qtcreator-vcs-log.png new file mode 100644 index 00000000000..e74cd3dade8 Binary files /dev/null and b/doc/qtcreator-vcs-log.png differ diff --git a/doc/qtcreator-vcs-pane.png b/doc/qtcreator-vcs-pane.png new file mode 100644 index 00000000000..faea0cf32e1 Binary files /dev/null and b/doc/qtcreator-vcs-pane.png differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index c8125fabd85..92c01dd1711 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -881,8 +881,18 @@ \i \gui{Stash} \i Stash local changes prior to executing a \bold{pull}. \row - \i - \i + \i \gui{Pull} + \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 */ diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 14fb56a38e9..c7bf1e58035 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/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 -// since the build directory could change, and thus the generated files that are present -// TODO check that it works +// TODO this function should also be called if the build directory is changed void Qt4ProFileNode::updateUiFiles() { // Only those two project types can have ui files for us