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:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
This commit is contained in:
Eike Ziller
2017-05-09 15:07:30 +02:00
parent d571e8d442 3282f85f3d
commit 6e8ee7479e
69 changed files with 475 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -799,7 +799,8 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
} else {
adaptedOutput = output;
// Strip first line, which is )]}'
adaptedOutput.remove(0, adaptedOutput.indexOf("\n"));
if (adaptedOutput.startsWith(')'))
adaptedOutput.remove(0, adaptedOutput.indexOf("\n"));
}
bool res = true;