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>
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

View File

@@ -33,21 +33,22 @@ const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
{
static TextEditor::Keywords keywords(
QStringList{ // variables
"ANDROID_ABIS",
Android::Constants::ANDROID_ABI,
Android::Constants::ANDROID_ABIS,
"ANDROID_API_VERSION",
QLatin1String(Android::Constants::ANDROID_APPLICATION_ARGUMENTS),
Android::Constants::ANDROID_APPLICATION_ARGUMENTS,
"ANDROID_BUNDLED_JAR_DEPENDENCIES",
"ANDROID_DEPLOYMENT_DEPENDENCIES",
QLatin1String(Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE),
QLatin1String(Android::Constants::ANDROID_EXTRA_LIBS),
Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE,
Android::Constants::ANDROID_EXTRA_LIBS,
"ANDROID_EXTRA_PLUGINS",
"ANDROID_FEATURES",
"ANDROID_LIB_DEPENDENCIES",
"ANDROID_MIN_SDK_VERSION",
QLatin1String(Android::Constants::ANDROID_PACKAGE_SOURCE_DIR),
Android::Constants::ANDROID_PACKAGE_SOURCE_DIR,
"ANDROID_PERMISSIONS",
"ANDROID_TARGET_SDK_VERSION",
"ANDROID_TARGET_ARCH",
Android::Constants::ANDROID_TARGET_ARCH,
"ANDROID_VERSION_CODE",
"ANDROID_VERSION_NAME",
"ARGC",