diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-04 16:10:51 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-04 16:11:17 +0300 |
| commit | 5e8e619dd07dd1fe1c7c101d9ca4e881cf4054a0 (patch) | |
| tree | e9ca099138efd676c7c18df09df6cc6872bdceb3 /src/plugins/android/androidsdkmanager.cpp | |
| parent | 2966b7349fcfdb667414ce8bbc8d25ca31cd8cc5 (diff) | |
| parent | 6afdb8bdf957909d086684ada10cf86f132c3efe (diff) | |
| download | qt-creator-5e8e619dd07dd1fe1c7c101d9ca4e881cf4054a0.tar.gz | |
Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
Diffstat (limited to 'src/plugins/android/androidsdkmanager.cpp')
| -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 ee4f14ae93..ac518bdd21 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 { @@ -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. |