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

Android: Deduplicate string literals and use constants instead

Browse Source 
Improves findability of identical string in code (via code model).
Reduces risk of typos.

Change-Id: I0e9d9af8eed5cd9b66bf303cfee99c53513bf314
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-02-09 21:37:21 +01:00
parent 67788a90bb
commit 9e2c6fbfca
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -587,7 +587,7 @@ void CMakeBuildSystem::updateProjectData()
}
{
CMakeConfigItem paths;
paths.key = "ANDROID_SO_LIBS_PATHS";
paths.key = Android::Constants::ANDROID_SO_LIBS_PATHS;
paths.values = Utils::toList(res);
patchedConfig.append(paths);
}
@@ -607,7 +607,7 @@ void CMakeBuildSystem::updateProjectData()
if (newRoot) {
setRootProjectNode(std::move(newRoot));
CMakeConfigItem settingFileItem;
settingFileItem.key = "ANDROID_DEPLOYMENT_SETTINGS_FILE";
settingFileItem.key = Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE;
const FilePath buildDir = cmakeBuildConfiguration()->buildDirectory();
if (p->rootProjectNode()) {

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

@@ -129,22 +129,22 @@ QVariant CMakeTargetNode::data(Utils::Id role) const
};
if (role == Android::Constants::AndroidPackageSourceDir)
return value("ANDROID_PACKAGE_SOURCE_DIR");
return value(Android::Constants::ANDROID_PACKAGE_SOURCE_DIR);
if (role == Android::Constants::AndroidDeploySettingsFile)
return value("ANDROID_DEPLOYMENT_SETTINGS_FILE");
return value(Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE);
if (role == Android::Constants::AndroidExtraLibs)
return value("ANDROID_EXTRA_LIBS");
return value(Android::Constants::ANDROID_EXTRA_LIBS);
if (role == Android::Constants::ANDROID_APPLICATION_ARGUMENTS)
return value("QT_ANDROID_APPLICATION_ARGUMENTS");
return value(Android::Constants::QT_ANDROID_APPLICATION_ARGUMENTS);
if (role == Android::Constants::AndroidArch)
return value("ANDROID_ABI");
return value(Android::Constants::ANDROID_ABI);
if (role == Android::Constants::AndroidSoLibPath)
return values("ANDROID_SO_LIBS_PATHS");
return values(Android::Constants::ANDROID_SO_LIBS_PATHS);
if (role == Android::Constants::AndroidTargets)
return values("TARGETS_BUILD_PATH");