diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-07-31 13:36:18 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-07-31 11:45:51 +0000 |
| commit | 319a52cc3e3b47e25cd3360ab4cd670d016cf709 (patch) | |
| tree | 7f10c1c9ce6b776e9ef082dd45c294a04b028ff8 /src/plugins/android/androidbuildapkstep.cpp | |
| parent | 5a3da744226870f11d910d0ae720cebdf1325d69 (diff) | |
| download | qt-creator-319a52cc3e3b47e25cd3360ab4cd670d016cf709.tar.gz | |
Android: Fix SDK tool's version displayed in the error
Task-number: QTCREATORBUG-18655
Change-Id: Iaee5118a74b4e83903af50d03e72c8bd6fa4a8b4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/android/androidbuildapkstep.cpp')
| -rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 4461807198..13d32a37ab 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -142,11 +142,12 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) if (!version) return false; - if (AndroidConfigurations::currentConfig().sdkToolsVersion() >= gradleScriptRevokedSdkVersion && + const QVersionNumber sdkToolsVersion = AndroidConfigurations::currentConfig().sdkToolsVersion(); + if (sdkToolsVersion >= gradleScriptRevokedSdkVersion && QVersionNumber::fromString(version->qtVersionString()) < gradleScriptsContainedQtVersion) { 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(gradleScriptRevokedSdkVersion.toString()) + .arg(sdkToolsVersion.toString()) .arg(gradleScriptsContainedQtVersion.toString()), OutputFormat::Stderr); return false; } |