From 2ebd51fca305048711ac92d2c01ff57aa646a156 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 30 Aug 2017 11:24:43 +0300 Subject: [PATCH] Android: Search for gradle template in QT_DIR/src/3rdparty/gradle Qt 5.6.3 LTS adds gradle template but QtCreator failed to use it because it compares Qt versions instead to search for gradle templates in QT_DIR/src/3rdparty/gradle Task-number: QTCREATORBUG-18811 Change-Id: I97c817f143a1d76fe4e2544b138cad9f4914eeee Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen Reviewed-by: Vikas Pachdha --- src/plugins/android/androidbuildapkstep.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 13d32a37ab6..a8bb143a756 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -61,7 +61,6 @@ namespace Android { using namespace Internal; const QVersionNumber gradleScriptRevokedSdkVersion(25, 3, 0); -const QVersionNumber gradleScriptsContainedQtVersion(5, 9, 0); const char DeployActionKey[] = "Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction"; const char KeystoreLocationKey[] = "KeystoreLocation"; const char BuildTargetSdkKey[] = "BuildTargetSdk"; @@ -144,11 +143,10 @@ bool AndroidBuildApkStep::init(QList &earlierSteps) const QVersionNumber sdkToolsVersion = AndroidConfigurations::currentConfig().sdkToolsVersion(); if (sdkToolsVersion >= gradleScriptRevokedSdkVersion && - QVersionNumber::fromString(version->qtVersionString()) < gradleScriptsContainedQtVersion) { + !version->sourcePath().appendPath("src/3rdparty/gradle").exists()) { emit addOutput(tr("The installed SDK tools version (%1) does not include Gradle scripts. The " "minimum Qt version required for Gradle build to work is %2") - .arg(sdkToolsVersion.toString()) - .arg(gradleScriptsContainedQtVersion.toString()), OutputFormat::Stderr); + .arg(sdkToolsVersion.toString()).arg("5.9.0/5.6.3"), OutputFormat::Stderr); return false; }