diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-25 10:49:44 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-02 07:09:15 +0000 |
| commit | a4f2779452f6c3d3ddb16c5b0db02e7f03152cdf (patch) | |
| tree | b1b3ef3554a3aa6fc9f32f43eb7500001daa5a86 /src/plugins/cmakeprojectmanager | |
| parent | 6307b094feb2c82073354f36c506eccb028f2296 (diff) | |
Android: use correct variable for Android SDK with CMake for Qt 6
Qt 6 for Android with CMake uses ANDROID_SDK_ROOT (similar to qmake),
instead of ANDROID_SDK.
Task-number: QTCREATORBUG-24678
Change-Id: Ic858b8d76b41b57ef35864a1981ebd142d0cccfd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 47e93c19da2..4cfc239c0d6 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -165,21 +165,25 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id) } initialArgs.append(QString::fromLatin1("-DANDROID_ABI:STRING=%1").arg(preferredAbi)); - QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); - if (qt && qt->supportsMultipleQtAbis()) { - auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>(); - initialArgs.append( - QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); - } - initialArgs.append(QString::fromLatin1("-DANDROID_STL:STRING=c++_shared")); initialArgs.append( QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}")); + QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); + QString androidSdkKey = "-DANDROID_SDK"; + 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<FilePath>(); + initialArgs.append( + QString("%1:PATH=%2").arg(androidSdkKey).arg(sdkLocation.toString())); } } |