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 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
This commit is contained in:
Eike Ziller
2017-05-15 15:31:55 +02:00
parent 36c8227caf 02d2b36ce7
commit 64b19af7dd
39 changed files with 168 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,7 @@ public:
~QueryContext();
void start();
void terminate();
signals:
void resultRetrieved(const QByteArray &);
@@ -242,7 +243,6 @@ private:
void timeout();
void errorTermination(const QString &msg);
void terminate();
QProcess m_process;
QTimer m_timer;
@@ -498,10 +498,8 @@ QStandardItem *GerritModel::itemForNumber(int number) const
void GerritModel::refresh(const QSharedPointer<GerritServer> &server, const QString &query)
{
if (m_query) {
qWarning("%s: Another query is still running", Q_FUNC_INFO);
return;
}
if (m_query)
m_query->terminate();
clearData();
m_server = server;
@@ -655,7 +653,7 @@ static GerritChangePtr parseSshOutput(const QJsonObject &object)
{
"value": 0,
"_account_id": 1000528,
"name": "André Hartmann",
"name": "Andre Hartmann",
"email": "aha_1980@gmx.de"
},
{
@@ -684,7 +682,7 @@ static GerritChangePtr parseSshOutput(const QJsonObject &object)
{
"value": 0,
"_account_id": 1000528,
"name": "André Hartmann",
"name": "Andre Hartmann",
"email": "aha_1980@gmx.de"
},
{