diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2020-08-20 13:58:21 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2020-09-07 07:10:26 +0000 |
| commit | a650997448de4376fb833d52e56596e0bcfb55f4 (patch) | |
| tree | cd0f5d82a20a4ef71d3f5832b13d0bd2276ea4e7 /src/plugins/cmakeprojectmanager | |
| parent | 13b72eb62140c25ca6f293d490d8668fd83ec66a (diff) | |
QtSupport: Add supportsMultipleQtAbis getter
Introduce bool QtSupport::supportsMultipleQtAbis().
Let AndroidQtVersion respond according to the QVersionNumber.
This allows to replace the version arithmetics in several
places with straight forward (and better findable) function calls.
Task-number: QTCREATORBUG-24471
Change-Id: Ib6e39fd6485a54e08ad66f84d4e2582989043419
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 48507a56114..d99c98230fc 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -166,7 +166,7 @@ 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->qtVersion() >= QtSupport::QtVersionNumber{5, 14, 0}) { + if (qt && qt->supportsMultipleQtAbis()) { auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>(); initialArgs.append( QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); |