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

Merge remote-tracking branch 'origin/4.4' into 4.5

Browse Source 
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
This commit is contained in:
Orgad Shaneh
2017-10-04 16:10:51 +03:00
parent 2966b7349f 6afdb8bdf9
commit 5e8e619dd0
19 changed files with 1686 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidsdkmanager.cpp
View File

@@ -33,6 +33,7 @@
#include "utils/environment.h"
#include <QLoggingCategory>
#include <QRegularExpression>
#include <QSettings>
namespace {
@@ -172,8 +173,9 @@ void SdkManagerOutputParser::parsePackageListing(const QString &output)
}
};
foreach (QString outputLine, output.split('\n')) {
MarkerTag marker = parseMarkers(outputLine);
QRegularExpression delimiters("[\n\r]");
foreach (QString outputLine, output.split(delimiters)) {
MarkerTag marker = parseMarkers(outputLine.trimmed());
if (marker & SectionMarkers) {
// Section marker found. Update the current section being parsed.