From 2092d576765eedf67f476481de4b01c748cb857e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 22 Mar 2017 14:30:13 +0100 Subject: Doc: Describe Gerrit changes Update screenshots. Change-Id: I1392d932613c2673e482dc121b13b7335c1ed713 Reviewed-by: Orgad Shaneh --- doc/images/qtcreator-gerrit-options.png | Bin 6697 -> 20725 bytes doc/images/qtcreator-gerrit.png | Bin 135269 -> 172409 bytes doc/src/vcs/creator-vcs-git.qdoc | 16 +++++++++++----- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/images/qtcreator-gerrit-options.png b/doc/images/qtcreator-gerrit-options.png index cf6be7a328..9ead8c2b2e 100644 Binary files a/doc/images/qtcreator-gerrit-options.png and b/doc/images/qtcreator-gerrit-options.png differ diff --git a/doc/images/qtcreator-gerrit.png b/doc/images/qtcreator-gerrit.png index b02fd2a21f..1ba060be74 100644 Binary files a/doc/images/qtcreator-gerrit.png and b/doc/images/qtcreator-gerrit.png 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 > -- cgit v1.2.1