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

Android: Merge {Qmake,}AndroidSupport::androiddeployqtPath

Browse Source 
... into its only user, in the build-system agnostic base.

Change-Id: I1fe312125a32e3150e4f3183470df716896e55c4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-06-13 14:54:20 +02:00
parent d4f5b74df9
commit 1058e21d02
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,13 +176,15 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
m_useAndroiddeployqt = qtSupport && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
if (m_useAndroiddeployqt) {
Utils::FileName tmp = qtSupport->androiddeployqtPath(target());
if (tmp.isEmpty()) {
m_command = version->qmakeProperty("QT_HOST_BINS");
if (m_command.isEmpty()) {
emit addOutput(tr("Cannot find the androiddeployqt tool."), OutputFormat::Stderr);
return false;
}
if (!m_command.endsWith(QLatin1Char('/')))
m_command += QLatin1Char('/');
m_command += Utils::HostOsInfo::withExecutableSuffix(QLatin1String("androiddeployqt"));
m_command = tmp.toString();
m_workingDirectory = bc ? bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString()
: QString();

1
src/plugins/android/androidqtsupport.h
View File

@@ -69,7 +69,6 @@ public:
virtual QStringList soLibSearchPath(const ProjectExplorer::Target *target) const = 0;
virtual QStringList projectTargetApplications(const ProjectExplorer::Target *target) const = 0;
virtual Utils::FileName apkPath(const ProjectExplorer::Target *target) const;
virtual Utils::FileName androiddeployqtPath(const ProjectExplorer::Target *target) const = 0;
virtual void manifestSaved(const ProjectExplorer::Target *target) = 0;
virtual QString targetDataItem(Core::Id role, const ProjectExplorer::Target *target) const = 0;

13
src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
View File

@@ -141,19 +141,6 @@ QStringList QmakeAndroidSupport::projectTargetApplications(const ProjectExplorer
return apps;
}
Utils::FileName QmakeAndroidSupport::androiddeployqtPath(const ProjectExplorer::Target *target) const
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
if (!version)
return Utils::FileName();
QString command = version->qmakeProperty("QT_HOST_BINS");
if (!command.endsWith(QLatin1Char('/')))
command += QLatin1Char('/');
command += Utils::HostOsInfo::withExecutableSuffix(QLatin1String("androiddeployqt"));
return Utils::FileName::fromString(command);
}
void QmakeAndroidSupport::manifestSaved(const ProjectExplorer::Target *target)
{
ProjectExplorer::BuildConfiguration *bc = target->activeBuildConfiguration();

2
src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
View File

@@ -38,8 +38,6 @@ public:
bool canHandle(const ProjectExplorer::Target *target) const override;
QStringList soLibSearchPath(const ProjectExplorer::Target *target) const override;
QStringList projectTargetApplications(const ProjectExplorer::Target *target) const override;
Utils::FileName androiddeployqtPath(const ProjectExplorer::Target *target) const override;
void manifestSaved(const ProjectExplorer::Target *target) override;
QString targetDataItem(Core::Id role, const ProjectExplorer::Target *target) const override;