From 2695bcb167efd1ce6d4d7df77a177df1c1c21de5 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 21 Sep 2021 21:11:00 +0300
Subject: [PATCH] Android: switch qmlpreview to use new Android Device
 mechanism

Amends 261a39cbbd2fa53d35bd4d4de8642dc341f9f6ad, after switching
Android plugin to use new device selection mechanism in
96255208a53532906c1b0c3130dc53776efa3a71.

Change-Id: I7b2dd1950055f3e6f1a449778f44d57c0c0a8758
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidqmlpreviewworker.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index e911a3f3bc8..9325d16f064 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -31,12 +31,16 @@
 #include "androidqmlpreviewworker.h"
 
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/buildsystem.h>
+#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
+
 #include <qmlprojectmanager/qmlprojectconstants.h>
 #include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
@@ -258,10 +262,11 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
 
     if (!avdMan.isAvdBooted(devSN)) {
         m_devInfo = {};
-        int minTargetApi = AndroidManager::minimumSDK(m_rc->target());
-        AndroidDeviceInfo devInfoLocal = AndroidConfigurations::showDeviceDialog(m_rc->project(),
-                                                                                 minTargetApi,
-                                                                                 apkInfo()->abis);
+        int minTargetApi = AndroidManager::minimumSDK(m_rc->target()->kit());
+        using namespace ProjectExplorer;
+        const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).data();
+        AndroidDeviceInfo devInfoLocal = AndroidDevice::androidDeviceInfoFromIDevice(dev);
+
         if (devInfoLocal.isValid()) {
             if (devInfoLocal.type == AndroidDeviceInfo::Emulator) {
                 appendMessage(tr("Launching AVD."), NormalMessageFormat);