Merge remote-tracking branch 'origin/4.12'

Change-Id: I3e7049da2c3da6f784e3cb3407c22ada556e5d24
2020-02-26 08:35:05 +01:00
parent 23946de457 fa59e02f89
commit 61dc14b67f
419 changed files with 18939 additions and 2729 deletions
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -539,6 +539,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
        return QLatin1String("Android 9");
    case 29:
        return QLatin1String("Android 10");
+    case 30:
+        return QLatin1String("Android 11");
    default:
        return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
    }