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

Android: Fix the SDK platforms parsing for SDK tools 26.1.1

Browse Source 
Task-number: QTCREATORBUG-18962
Change-Id: I780193be482ebc151931196792068d7c4d1ad808
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2017-09-26 15:29:44 +02:00
parent 315031e3f5
commit 66a42a7ffb
1 changed files with 4 additions and 2 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 "utils/environment.h"
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QRegularExpression>
#include <QSettings> #include <QSettings>
namespace { namespace {
@@ -175,8 +176,9 @@ void SdkManagerOutputParser::parsePackageListing(const QString &output)
} }
}; };
foreach (QString outputLine, output.split('\n')) { QRegularExpression delimiters("[\n\r]");
MarkerTag marker = parseMarkers(outputLine); foreach (QString outputLine, output.split(delimiters)) {
MarkerTag marker = parseMarkers(outputLine.trimmed());
if (marker & SectionMarkers) { if (marker & SectionMarkers) {
// Section marker found. Update the current section being parsed. // Section marker found. Update the current section being parsed.