feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp

Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b
This commit is contained in:
Eike Ziller
2018-11-29 12:59:51 +01:00
parent ba4c434211 9eb66a806f
commit 29c9f8080d
63 changed files with 638 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidmanager.cpp
View File

@@ -364,7 +364,7 @@ void AndroidManager::setDeviceApiLevel(ProjectExplorer::Target *target, int leve
QPair<int, int> AndroidManager::apiLevelRange()
{
return qMakePair(16, 27);
return qMakePair(16, 28);
}
QString AndroidManager::androidNameForApiLevel(int x)
@@ -418,6 +418,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
return QLatin1String("Android 8.0");
case 27:
return QLatin1String("Android 8.1");
case 28:
return QLatin1String("Android 9");
default:
return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
}