diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-09-26 15:29:44 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-09-28 12:34:59 +0000 |
| commit | 66a42a7ffbff53368251ff62535a10490c360f0a (patch) | |
| tree | 517031127015f9a687ee398ec15a040d3bfe759b | |
| parent | 315031e3f58fbae4e11413651dbf4bf1dc791196 (diff) | |
| download | qt-creator-66a42a7ffbff53368251ff62535a10490c360f0a.tar.gz | |
Android: Fix the SDK platforms parsing for SDK tools 26.1.1
Task-number: QTCREATORBUG-18962
Change-Id: I780193be482ebc151931196792068d7c4d1ad808
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/plugins/android/androidsdkmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index c28fef27a1..85903aa1ad 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -33,6 +33,7 @@ #include "utils/environment.h" #include <QLoggingCategory> +#include <QRegularExpression> #include <QSettings> namespace { @@ -175,8 +176,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. |