summaryrefslogtreecommitdiff
path: root/src/plugins/git/gerrit/gerritserver.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2017-03-12 23:47:56 +0200
committerOrgad Shaneh <orgads@gmail.com>2017-03-13 05:55:20 +0000
commitf71971323e17e6aba686ef039e81e026b836ae78 (patch)
treefe3a4dbf9340567319127437c38e6a0b5b9a75b3 /src/plugins/git/gerrit/gerritserver.cpp
parentd08cbf664151cd9a083e6779dbcb854e0ee2bbaf (diff)
downloadqt-creator-f71971323e17e6aba686ef039e81e026b836ae78.tar.gz
Gerrit: Fix host/port resolving
Broke by b0ac6435b3786854e7a8d10cf4d8df49ca74618a. Change-Id: I66f9c598b5e7466b93857cb19c40d1d6c796793a Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/git/gerrit/gerritserver.cpp')
-rw-r--r--src/plugins/git/gerrit/gerritserver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp
index 3c8d028fdf..990279951d 100644
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -126,9 +126,11 @@ bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters
else
return false;
- user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (r.host.contains("github.com")) // Clearly not gerrit
return false;
+ host = r.host;
+ port = r.port;
+ user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (type != GerritServer::Ssh) {
curlBinary = parameters.curl;
if (curlBinary.isEmpty() || !QFile::exists(curlBinary))