From d604d5da180a71fb579d99ac36247a215d4edfe6 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 5 Nov 2020 14:21:12 +0200 Subject: [PATCH] Android: fix passing ANDROID_SDK_ROOT for CMake Task-number: QTBUG-87991 Change-Id: I70ed0709caf339324af8c233f311a2db2945006e Reviewed-by: Ville Voutilainen --- .../cmakeprojectmanager/cmakebuildconfiguration.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 4cfc239c0d6..1dcf14f3970 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -171,19 +171,15 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id) QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}")); QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); - QString androidSdkKey = "-DANDROID_SDK"; + auto sdkLocation = bs->data(Android::Constants::SdkLocation).value(); if (qt->qtVersion() >= QtSupport::QtVersionNumber{6, 0, 0}) { initialArgs.append( QString::fromLatin1("-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}")); - androidSdkKey.append("_ROOT"); - } - - if (qt && qt->supportsMultipleQtAbis()) { - auto sdkLocation = bs->data(Android::Constants::SdkLocation).value(); - initialArgs.append( - QString("%1:PATH=%2").arg(androidSdkKey).arg(sdkLocation.toString())); + initialArgs.append(QString("-DANDROID_SDK_ROOT:PATH=%1").arg(sdkLocation.toString())); + } else { + initialArgs.append(QString("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); } }