diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-07-16 17:36:52 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-07-17 11:29:17 +0200 |
| commit | a3454cadb64bf0b11c471fb544b352e58f57bb1f (patch) | |
| tree | c6963b3ec5499af4139177e62ba7b9742a31c243 | |
| parent | 41ba6f38e437062bdcd4022ca890a4cd63b2ec60 (diff) | |
| download | qt-creator-a3454cadb64bf0b11c471fb544b352e58f57bb1f.tar.gz | |
Android: Support Android-L with a hack
android list avd outputs "Target: Android L (Preview) (API level L)",
which we treat as API Level 20 now.
Change-Id: Idc74fc833ffd69959af9d25cdaaa115f35c06831
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index b2021b34a1..3f89ad2c9a 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -620,8 +620,13 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const line = QLatin1String(avds[i]); if (line.contains(QLatin1String("---------"))) break; - if (line.contains(QLatin1String("Target:"))) - dev.sdk = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).toInt(); + if (line.contains(QLatin1String("Target:"))) { + QString tmp = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).trimmed(); + if (tmp == QLatin1String("L")) // HACK for android-L preview + dev.sdk = 20; + else + dev.sdk = tmp.toInt(); + } if (line.contains(QLatin1String("Tag/ABI:"))) dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char('/')) +1); else if (line.contains(QLatin1String("ABI:"))) |