From 9116256a865b63dc379ca40e8e0dd7da589aaad3 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 10 Nov 2021 19:49:59 +0100 Subject: [PATCH] QmlDesigner: Add fake Android kit workaround Add a workaround to make a fake Android kit work. Fake in this case that it uses a default desktop Qt version which doesn't contain any Android compilers. In order for that to work the deploy step needs to be skipped. Task-number: QDS-5385 Change-Id: I69a5c78ac810de916b3180736e61d6083d66d121 Reviewed-by: Alessandro Portale Reviewed-by: Vikas Pachdha --- src/plugins/qmlpreview/qmlpreviewplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index 4902ac52361..6bd695ac72b 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -222,8 +222,8 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent) bool skipDeploy = false; const Kit *kit = SessionManager::startupTarget()->kit(); if (SessionManager::startupTarget() && kit) - skipDeploy = kit-> - supportedPlatforms().contains(Android::Constants::ANDROID_DEVICE_TYPE); + skipDeploy = kit->supportedPlatforms().contains(Android::Constants::ANDROID_DEVICE_TYPE) + || DeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE; ProjectExplorerPlugin::runStartupProject(Constants::QML_PREVIEW_RUN_MODE, skipDeploy); }); menu->addAction(