feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Android: add prepare_apk_dir CMake target by default"

Browse Source 
This reverts commit 9dcbb8ca01.

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>
This commit is contained in:
Assam Boudjelthia
2021-05-31 11:28:12 +00:00
parent f9a8e47d13
commit cd20ad8ff4
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -32,18 +32,15 @@
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmaketool.h" #include "cmaketool.h"
#include <android/androidconstants.h>
#include <coreplugin/find/itemviewfind.h> #include <coreplugin/find/itemviewfind.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h> #include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/processparameters.h> #include <projectexplorer/processparameters.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -479,30 +476,6 @@ QWidget *CMakeBuildStep::createConfigWidget()
connect(this, &CMakeBuildStep::buildTargetsChanged, widget, updateDetails); 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; return widget;
} }