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

Android: Remove code to help with upgrades from Qt 5.1

Browse Source 
Change-Id: Id9cf0cd585ebdaabc03ff58ab04e7c12a5af39ba
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-06-13 13:37:49 +02:00
parent a114a5e47e
commit 2093781f3a
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,9 +110,6 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
Q_UNUSED(earlierSteps); Q_UNUSED(earlierSteps);
m_androiddeployqtArgs.clear(); m_androiddeployqtArgs.clear();
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), OutputFormat::Stderr);
m_targetArch = AndroidManager::targetArch(target()); m_targetArch = AndroidManager::targetArch(target());
if (m_targetArch.isEmpty()) { if (m_targetArch.isEmpty()) {
emit addOutput(tr("No Android arch set by the .pro file."), OutputFormat::Stderr); emit addOutput(tr("No Android arch set by the .pro file."), OutputFormat::Stderr);

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

@@ -459,17 +459,6 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath,
return response.result == Utils::SynchronousProcessResponse::Finished && response.exitCode == 0; return response.result == Utils::SynchronousProcessResponse::Finished && response.exitCode == 0;
} }
bool AndroidManager::checkForQt51Files(Utils::FileName fileName)
{
fileName.appendPath(QLatin1String("android")).appendPath(QLatin1String("version.xml"));
if (!fileName.exists())
return false;
QDomDocument dstVersionDoc;
if (!openXmlFile(dstVersionDoc, fileName))
return false;
return dstVersionDoc.documentElement().attribute(QLatin1String("value")).toDouble() < 5.2;
}
AndroidQtSupport *AndroidManager::androidQtSupport(ProjectExplorer::Target *target) AndroidQtSupport *AndroidManager::androidQtSupport(ProjectExplorer::Target *target)
{ {
for (AndroidQtSupport *provider : g_androidQtSupportProviders) { for (AndroidQtSupport *provider : g_androidQtSupportProviders) {

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

@@ -83,7 +83,6 @@ public:
static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd); static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd);
static bool checkCertificateExists(const QString &keystorePath, const QString &keystorePasswd, static bool checkCertificateExists(const QString &keystorePath, const QString &keystorePasswd,
const QString &alias); const QString &alias);
static bool checkForQt51Files(Utils::FileName fileName);
static AndroidQtSupport *androidQtSupport(ProjectExplorer::Target *target); static AndroidQtSupport *androidQtSupport(ProjectExplorer::Target *target);
static bool updateGradleProperties(ProjectExplorer::Target *target); static bool updateGradleProperties(ProjectExplorer::Target *target);
static int findApiLevel(const Utils::FileName &platformPath); static int findApiLevel(const Utils::FileName &platformPath);

3
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
View File

@@ -72,9 +72,6 @@ QmakeAndroidBuildApkStep::QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepLis
bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
{ {
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), OutputFormat::Stderr);
if (!AndroidBuildApkStep::init(earlierSteps)) if (!AndroidBuildApkStep::init(earlierSteps))
return false; return false;