feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Clean up for extraData constants

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia
2021-09-05 18:49:26 +03:00
parent b7815a4187
commit 91117a1c36
19 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
View File

@@ -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".