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

Android: Remove "qtlive" support

Browse Source 
Productization of Qt Live preview for Android didn't happen.

Change-Id: Ie69d8193afec9b59d859bc65c45d36028247e2b9
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-15 18:52:57 +01:00
parent 290dcb555b
commit b7acfc37b5
4 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidconfigurations.cpp
View File

@@ -117,9 +117,6 @@ namespace {
const QLatin1String sdkToolsVersionKey("Pkg.Revision");
const QLatin1String ndkRevisionKey("Pkg.Revision");
const QString defaultQtLiveApk = Core::ICore::resourcePath() +
("/qtlive/android/armv7/qt_live_viewer.apk");
static QString sdkSettingsFileName()
{
return Core::ICore::installerResourcePath() + "/android.xml";
@@ -857,14 +854,6 @@ void AndroidConfig::setAutomaticKitCreation(bool b)
m_automaticKitCreation = b;
}
FilePath AndroidConfig::qtLiveApkPath() const
{
QString apkPathStr(defaultQtLiveApk);
if (qEnvironmentVariableIsSet("QTC_QT_LIVE_APK_PATH"))
apkPathStr = QString::fromLocal8Bit(qgetenv("QTC_QT_LIVE_APK_PATH"));
return Utils::FilePath::fromString(apkPathStr);
}
///////////////////////////////////
// AndroidConfigurations
///////////////////////////////////

2
src/plugins/android/androidconfigurations.h
View File

@@ -123,8 +123,6 @@ public:
bool automaticKitCreation() const;
void setAutomaticKitCreation(bool b);
Utils::FilePath qtLiveApkPath() const;
Utils::FilePath adbToolPath() const;
Utils::FilePath androidToolPath() const;
Utils::FilePath emulatorToolPath() const;

38
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -42,7 +42,6 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
@@ -175,9 +174,7 @@ bool AndroidDeployQtStep::init()
RunConfiguration *rc = target()->activeRunConfiguration();
QTC_ASSERT(rc, return false);
const bool deployQtLive = rc->id().name().startsWith(qmlProjectRunConfigIdName);
ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
QTC_ASSERT(deployQtLive || bc, return false);
auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(bc);
int minTargetApi = AndroidManager::minimumSDK(target());
@@ -205,8 +202,7 @@ bool AndroidDeployQtStep::init()
m_serialNumber = info.serialNumber;
qCDebug(deployStepLog) << "Selected Device:" << info;
if (!deployQtLive)
gatherFilesToPull();
gatherFilesToPull();
AndroidManager::setDeviceSerialNumber(target(), m_serialNumber);
AndroidManager::setDeviceApiLevel(target(), info.sdk);
@@ -222,8 +218,7 @@ bool AndroidDeployQtStep::init()
if (m_uninstallPreviousPackageRun)
m_manifestName = AndroidManager::manifestPath(target());
m_useAndroiddeployqt = !deployQtLive &&
version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
m_useAndroiddeployqt = version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
if (m_useAndroiddeployqt) {
const ProjectNode *node = target()->project()->findNodeForBuildKey(rc->buildKey());
@@ -273,8 +268,7 @@ bool AndroidDeployQtStep::init()
} else {
m_uninstallPreviousPackageRun = true;
m_command = AndroidConfigurations::currentConfig().adbToolPath();
const AndroidConfig &config = AndroidConfigurations::currentConfig();
m_apkPath = deployQtLive ? config.qtLiveApkPath() : AndroidManager::apkPath(target());
m_apkPath = AndroidManager::apkPath(target());
m_workingDirectory = bc ? bc->buildDirectory() : FilePath();
}
m_environment = bc ? bc->environment() : Utils::Environment();
@@ -304,34 +298,10 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy()
} else {
RunConfiguration *rc = target()->activeRunConfiguration();
QTC_ASSERT(rc, return DeployErrorCode::Failure);
const bool deployQtLive = rc->id().name().startsWith(qmlProjectRunConfigIdName);
QString packageName;
int packageVersion = -1;
if (deployQtLive) {
// Do not install Qt live if apk is already installed or the same version is
// being installed.
AndroidManager::apkInfo(m_apkPath, &packageName, &packageVersion);
if (AndroidManager::packageInstalled(m_serialNumber, packageName)) {
int installedVersion = AndroidManager::packageVersionCode(m_serialNumber,
packageName);
if (installedVersion == packageVersion) {
qCDebug(deployStepLog) << "Qt live APK already installed. APK version:"
<< packageVersion << "Installed version:"
<< installedVersion;
return DeployErrorCode::NoError;
} else {
qCDebug(deployStepLog) << "Re-installing Qt live APK. Version mismatch."
<< "APK version:" << packageVersion
<< "Installed version:" << installedVersion;
}
} else {
qCDebug(deployStepLog) << "Installing Qt live APK. APK version:" << packageVersion;
}
}
if (m_uninstallPreviousPackageRun) {
if (!deployQtLive)
packageName = AndroidManager::packageName(m_manifestName);
packageName = AndroidManager::packageName(m_manifestName);
if (packageName.isEmpty()) {
emit addOutput(tr("Cannot find the package name."), OutputFormat::Stderr);
return Failure;

8
src/plugins/android/androiddevice.cpp
View File

@@ -56,14 +56,6 @@ AndroidDevice::AndroidDevice()
setOsType(Utils::OsTypeOtherUnix);
setDeviceState(DeviceReadyToUse);
const AndroidConfig &config = AndroidConfigurations::currentConfig();
if (config.qtLiveApkPath().exists()) {
QString activityPath;
AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath);
qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath()
<< "Activity Path:" << activityPath;
setQmlsceneCommand(activityPath);
}
}
IDevice::DeviceInfo AndroidDevice::deviceInformation() const