From cd20ad8ff433acdf1629580e4700c2e9e394a962 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 31 May 2021 11:28:12 +0000
Subject: Revert "Android: add prepare_apk_dir CMake target by default"

This reverts commit 9dcbb8ca01e0981b6a3c7ea8dd278014343f48e3.

Reason for revert: This workaround is not needed anymore, since
Qt 6.1.2 (see 71348437939e62b0e3b86888e966b300ff1e2855).

Change-Id: I089457dc58c5b97136b30190fdf17cfb303f8bd8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 29 +---------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 5de90d1863..b4d9abfeb6 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -32,18 +32,15 @@
 #include "cmakeprojectconstants.h"
 #include "cmaketool.h"
 
-#include <android/androidconstants.h>
 #include <coreplugin/find/itemviewfind.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
-#include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+
 #include <utils/algorithm.h>
 #include <utils/layoutbuilder.h>
 
@@ -479,30 +476,6 @@ QWidget *CMakeBuildStep::createConfigWidget()
 
     connect(this, &CMakeBuildStep::buildTargetsChanged, widget, updateDetails);
 
-    // For Qt 6 for Android: Make sure to add "<target>_prepare_apk_dir" if only
-    // "all" target is selected. This copies the build shared libs to android-build
-    // folder, partially the same as done in AndroidPackageInstallationStep for
-    // qmake install step.
-    const Kit *k = target()->kit();
-    if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
-        const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k);
-        if (qt && qt->qtVersion() >= QtSupport::QtVersionNumber{6, 0, 0}) {
-            QMetaObject::Connection *const connection = new QMetaObject::Connection;
-            *connection = connect(this, &CMakeBuildStep::buildTargetsChanged, widget, [this, connection]() {
-                const QString mainTarget = activeRunConfigTarget();
-                if (!mainTarget.isEmpty()) {
-                    QStringList targets{buildTargets()};
-                    if (targets == QStringList{allTarget()}) {
-                        targets.append(QString("%1_prepare_apk_dir").arg(mainTarget));
-                        setBuildTargets({targets});
-                        QObject::disconnect(*connection);
-                        delete connection;
-                    }
-                }
-            });
-        }
-    }
-
     return widget;
 }
 
-- 
cgit v1.2.1