summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2017-03-22 14:30:13 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2017-03-22 13:43:24 +0000
commit2092d576765eedf67f476481de4b01c748cb857e (patch)
treeea8b0b08342e121eacd3616cb7409ff527ca80bd /doc
parent00bb2425f560df08cbb91a5329f856b565f27999 (diff)
downloadqt-creator-2092d576765eedf67f476481de4b01c748cb857e.tar.gz
Doc: Describe Gerrit changes
Update screenshots. Change-Id: I1392d932613c2673e482dc121b13b7335c1ed713 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qtcreator-gerrit-options.pngbin6697 -> 20725 bytes
-rw-r--r--doc/images/qtcreator-gerrit.pngbin135269 -> 172409 bytes
-rw-r--r--doc/src/vcs/creator-vcs-git.qdoc16
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/images/qtcreator-gerrit-options.png b/doc/images/qtcreator-gerrit-options.png
index cf6be7a328..9ead8c2b2e 100644
--- a/doc/images/qtcreator-gerrit-options.png
+++ b/doc/images/qtcreator-gerrit-options.png
Binary files differ
diff --git a/doc/images/qtcreator-gerrit.png b/doc/images/qtcreator-gerrit.png
index b02fd2a21f..1ba060be74 100644
--- a/doc/images/qtcreator-gerrit.png
+++ b/doc/images/qtcreator-gerrit.png
Binary files differ
diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc
index fccb31f00f..07214d7709 100644
--- a/doc/src/vcs/creator-vcs-git.qdoc
+++ b/doc/src/vcs/creator-vcs-git.qdoc
@@ -292,11 +292,6 @@
If your Git project uses Gerrit for code reviews, you can view your changes
in \QC.
- Select \uicontrol Tools > \uicontrol Options > \uicontrol {Version Control}
- > \uicontrol Gerrit to specify the connection to the Gerrit server.
-
- \image qtcreator-gerrit-options.png
-
To push committed changes to Gerrit, select \uicontrol Tools >
\uicontrol Git > \uicontrol {Remote Repository} >
\uicontrol {Push to Gerrit}.
@@ -319,6 +314,17 @@
To refresh the list of changes, select \uicontrol Refresh.
+ The \uicontrol Remote field lists the remotes of the current repository that
+ are detected as Gerrit servers. Select \uicontrol Tools > \uicontrol Options
+ > \uicontrol {Version Control} > \uicontrol Gerrit to specify a fallback
+ connection to a Gerrit server over SSH. The Gerrit REST interface and the
+ \l{https://curl.haxx.se/}{curl} tool are used for HTTP connections.
+
+ Select the \uicontrol HTTPS check box to prepend \c https to the Gerrit URL
+ if Gerrit does not provide it.
+
+ \image qtcreator-gerrit-options.png
+
\section1 Working with Git Tools
To start a graphical interface to Git, select \uicontrol Tools >