From 2093781f3ac57dc07cf6b4bdef8df1bbbf2e4ba5 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Jun 2018 13:37:49 +0200 Subject: [PATCH] Android: Remove code to help with upgrades from Qt 5.1 Change-Id: Id9cf0cd585ebdaabc03ff58ab04e7c12a5af39ba Reviewed-by: Vikas Pachdha --- src/plugins/android/androiddeployqtstep.cpp | 3 --- src/plugins/android/androidmanager.cpp | 11 ----------- src/plugins/android/androidmanager.h | 1 - .../qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 3 --- 4 files changed, 18 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index cd5803778b4..4d1a7ab6bf4 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -110,9 +110,6 @@ bool AndroidDeployQtStep::init(QList &earlierSteps) Q_UNUSED(earlierSteps); 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()); if (m_targetArch.isEmpty()) { emit addOutput(tr("No Android arch set by the .pro file."), OutputFormat::Stderr); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index ebf2349134d..61a87b2ddf3 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -459,17 +459,6 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath, 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) { for (AndroidQtSupport *provider : g_androidQtSupportProviders) { diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index b1ce3321317..0d35cf2f984 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -83,7 +83,6 @@ public: static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd); static bool checkCertificateExists(const QString &keystorePath, const QString &keystorePasswd, const QString &alias); - static bool checkForQt51Files(Utils::FileName fileName); static AndroidQtSupport *androidQtSupport(ProjectExplorer::Target *target); static bool updateGradleProperties(ProjectExplorer::Target *target); static int findApiLevel(const Utils::FileName &platformPath); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index a5774b2b608..65e4b325794 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -72,9 +72,6 @@ QmakeAndroidBuildApkStep::QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepLis bool QmakeAndroidBuildApkStep::init(QList &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)) return false;