Merge remote-tracking branch 'origin/3.6'

Change-Id: Ibee24c1c80984cdc45e7bcf3e4fbb5f1e6b81454
This commit is contained in:
Eike Ziller
2015-11-17 09:37:57 +01:00
51 changed files with 622 additions and 361 deletions

View File

@@ -71,16 +71,14 @@ public:
class GerritChange
{
public:
GerritChange() : number(0), depth(-1) {}
bool isValid() const { return number && !url.isEmpty() && !project.isEmpty(); }
QString filterString() const;
QStringList gitFetchArguments(const QSharedPointer<GerritParameters> &p) const;
QString url;
int number;
int dependsOnNumber;
int neededByNumber;
int number = 0;
int dependsOnNumber = 0;
int neededByNumber = 0;
QString title;
QString owner;
QString email;
@@ -89,7 +87,7 @@ public:
QString status;
QDateTime lastUpdated;
GerritPatchSet currentPatchSet;
int depth;
int depth = -1;
};
typedef QSharedPointer<GerritChange> GerritChangePtr;