diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-09-13 12:15:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-09-13 12:15:09 +0200 |
| commit | c635c6b50a50d4fe77d1816c15f661e9460b3e5b (patch) | |
| tree | 4c6da123b7ff00eb1371ae09ccc47b8217de6df2 /src/plugins/android/androidmanager.cpp | |
| parent | 8edda219d9f63f7e735535f38eecb63912aa71b1 (diff) | |
| parent | 181a17bbdcd407083769ae68fcb2eb8c76182df4 (diff) | |
| download | qt-creator-c635c6b50a50d4fe77d1816c15f661e9460b3e5b.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
src/plugins/android/androidrunner.cpp
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
tests/system/suite_WELP/tst_WELP03/test.py
Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 3e3d5666ea..a137338cbc 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -283,6 +283,8 @@ QString AndroidManager::androidNameForApiLevel(int x) return QLatin1String("Android 5.1"); case 23: return QLatin1String("Android 6.0"); + case 24: + return QLatin1String("Android 7.0"); default: return tr("Unknown Android version. API Level: %1").arg(QString::number(x)); } |