Implements previewing qml preview for a qmlproject

To run it requires either designpreview.apk installed
on the device or apks placed in
<QTCREATATORDIR>/share/qtcreator/android/qtdesignviewer/
Apk filename should follow designpreview_$ARCH.apk

Task-number: QAA-512
Change-Id: Ida955b0fac519112d4623166677a7ba8e9afb1f4
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Alessandro Portale <[email protected]>

1 files changed, 2 insertions, 14 deletions

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 0002b23fe35..607cc79c70a 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -34,6 +34,7 @@
 #include "androidmanifesteditorfactory.h"
 #include "androidpackageinstallationstep.h"
 #include "androidpotentialkit.h"
+#include "androidqmlpreviewworker.h"
 #include "androidqmltoolingsupport.h"
 #include "androidqtversion.h"
 #include "androidrunconfiguration.h"
@@ -96,14 +97,6 @@ public:
     }
 };
 
-class AndroidQmlPreviewWorker : public AndroidQmlToolingSupport
-{
-public:
-    AndroidQmlPreviewWorker(RunControl *runControl)
-        : AndroidQmlToolingSupport(runControl, runControl->runnable().command.executable().toString())
-    {}
-};
-
 class AndroidPluginPrivate : public QObject
 {
 public:
@@ -136,14 +129,9 @@ public:
         {runConfigFactory.runConfigurationId()}
     };
     RunWorkerFactory qmlPreviewWorkerFactory{
-        RunWorkerFactory::make<AndroidQmlToolingSupport>(),
-        {QML_PREVIEW_RUN_MODE},
-        {runConfigFactory.runConfigurationId()}
-    };
-    RunWorkerFactory qmlPreviewWorkerFactory2{
         RunWorkerFactory::make<AndroidQmlPreviewWorker>(),
         {QML_PREVIEW_RUN_MODE},
-        {"QmlProjectManager.QmlRunConfiguration"},
+        {"QmlProjectManager.QmlRunConfiguration.Qml", runConfigFactory.runConfigurationId()},
         {Android::Constants::ANDROID_DEVICE_TYPE}
     };