diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-05 18:49:26 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-06 08:07:42 +0000 |
| commit | 91117a1c3652f13f76a11ef69a52f9c0aa7a0004 (patch) | |
| tree | e8e3072ea1788d022ef42e5ded8d87f238efa797 /src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | |
| parent | b7815a418733b2f191a07837a17cca472b8d90af (diff) | |
| download | qt-creator-91117a1c3652f13f76a11ef69a52f9c0aa7a0004.tar.gz | |
Android: Clean up for extraData constants
clean, rename and delete unused constants, we well as unify the
usage between qmake, cmake, and qbs.
Change-Id: I8827ac2f2f7660e337694fef17f744e727bd776a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 6c84e3d872..86d97babfe 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -128,20 +128,26 @@ QVariant CMakeTargetNode::data(Utils::Id role) const return {}; }; + if (role == Android::Constants::AndroidAbi) + return value(Android::Constants::ANDROID_ABI); + + if (role == Android::Constants::AndroidAbis) + return value(Android::Constants::ANDROID_ABIS); + + // TODO: Concerns the variables below. Qt 6 uses target properties which cannot be read + // by the current mechanism, and the variables start with "Qt_" prefix. + if (role == Android::Constants::AndroidPackageSourceDir) return value(Android::Constants::ANDROID_PACKAGE_SOURCE_DIR); - if (role == Android::Constants::AndroidDeploySettingsFile) - return value(Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE); - if (role == Android::Constants::AndroidExtraLibs) return value(Android::Constants::ANDROID_EXTRA_LIBS); - if (role == Android::Constants::ANDROID_APPLICATION_ARGUMENTS) - return value(Android::Constants::QT_ANDROID_APPLICATION_ARGUMENTS); + if (role == Android::Constants::AndroidDeploySettingsFile) + return value(Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE); - if (role == Android::Constants::AndroidArch) - return value(Android::Constants::ANDROID_ABI); + if (role == Android::Constants::AndroidApplicationArgs) + return value(Android::Constants::ANDROID_APPLICATION_ARGUMENTS); if (role == Android::Constants::ANDROID_ABIS) return value(Android::Constants::ANDROID_ABIS); @@ -152,6 +158,9 @@ QVariant CMakeTargetNode::data(Utils::Id role) const if (role == Android::Constants::AndroidTargets) return values("TARGETS_BUILD_PATH"); + if (role == Android::Constants::AndroidApk) + return {}; + if (role == Ios::Constants::IosTarget) { // For some reason the artifact is e.g. "Debug/untitled.app/untitled" which is wrong. // It actually is e.g. "Debug-iphonesimulator/untitled.app/untitled". |