Merge remote-tracking branch 'origin/8.0'

Change-Id: I1dc664137eeecb7dd69f29af7a08164683d51077
2022-08-03 17:51:42 +02:00
parent a714ddf59f f8c3d860fc
commit 7950a038b4
13 changed files with 129 additions and 12 deletions
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -122,7 +122,7 @@ QString GerritServer::url(UrlType urlType) const
        case Https: protocol = "https"; break;
    }
    QString res = protocol + "://";
-    if (type == Ssh || urlType != DefaultUrl)
+    if (type == Ssh || urlType == UrlWithHttpUser)
        res += hostArgument();
    else
        res += host;