Merge remote-tracking branch 'origin/master' into 4.12

Change-Id: I60aa7c97c13144d3c31989244517c21a72202ab9
2020-02-13 09:10:52 +01:00
parent f2cd459ec5 1e3b7475f6
commit c3911002fd
43 changed files with 460 additions and 316 deletions
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -78,6 +78,8 @@ Project {
            "androidrunner.h",
            "androidrunnerworker.cpp",
            "androidrunnerworker.h",
+            "androidsdkdownloader.cpp",
+            "androidsdkdownloader.h",
            "androidsdkmanager.cpp",
            "androidsdkmanager.h",
            "androidsdkmanagerwidget.cpp",