From 66a42a7ffbff53368251ff62535a10490c360f0a Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Tue, 26 Sep 2017 15:29:44 +0200
Subject: 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>
---
 src/plugins/android/androidsdkmanager.cpp | 6 ++++--
 1 file 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.
-- 
cgit v1.2.1