From 319a52cc3e3b47e25cd3360ab4cd670d016cf709 Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Mon, 31 Jul 2017 13:36:18 +0200
Subject: [PATCH] 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>
---
 src/plugins/android/androidbuildapkstep.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 4461807198d..13d32a37ab6 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;
     }