feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
This commit is contained in:
Orgad Shaneh
2017-06-02 15:03:36 +03:00
parent a9d511ff7d ec3015663a
commit 89057b552b
38 changed files with 225 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -546,7 +546,9 @@ static GerritUser parseGerritUser(const QJsonObject &object)
static int numberValue(const QJsonObject &object)
{
return object.value("number").toString().toInt();
const QJsonValue number = object.value("number");
// Since Gerrit 2.14 (commits fa92467dc and b0cfe1401) the change and patch set numbers are int
return number.isString() ? number.toString().toInt() : number.toInt();
}
/* Parse gerrit query Json output.