1 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h
index df8c821f98..02bb50b348 100644
--- a/src/plugins/android/androidconstants.h
+++ b/src/plugins/android/androidconstants.h
@@ -42,9 +42,9 @@ namespace Internal {
 namespace Constants {
 const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations";
 const char ANDROID_TOOLCHAIN_TYPEID[] = "Qt4ProjectManager.ToolChain.Android";
-const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android";
+const char ANDROID_QT_TYPE[] = "Qt4ProjectManager.QtVersion.Android";
 
-const char ANDROID_AMSTARTARGS[] = "Android.AmStartArgs";
+const char ANDROID_AM_START_ARGS[] = "Android.AmStartArgs";
 // Note: Can be set on RunConfiguration using an aspect and/or
 // the AndroidRunnerWorker using recordData()
 const char ANDROID_PRESTARTSHELLCMDLIST[] = "Android.PreStartShellCmdList";
@@ -67,32 +67,33 @@ const char ANDROID_ARCHITECTURE[] = "Android.Architecture";
 const char ANDROID_PACKAGE_SOURCE_DIR[] = "ANDROID_PACKAGE_SOURCE_DIR";
 const char ANDROID_EXTRA_LIBS[] = "ANDROID_EXTRA_LIBS";
 const char ANDROID_ABI[] = "ANDROID_ABI";
+const char ANDROID_TARGET_ARCH[] = "ANDROID_TARGET_ARCH";
 const char ANDROID_ABIS[] = "ANDROID_ABIS";
 const char ANDROID_APPLICATION_ARGUMENTS[] = "ANDROID_APPLICATION_ARGUMENTS";
-const char QT_ANDROID_APPLICATION_ARGUMENTS[] = "QT_ANDROID_APPLICATION_ARGUMENTS";
 const char ANDROID_DEPLOYMENT_SETTINGS_FILE[] = "ANDROID_DEPLOYMENT_SETTINGS_FILE";
 const char ANDROID_SO_LIBS_PATHS[] = "ANDROID_SO_LIBS_PATHS";
 
-const char ANDROID_PACKAGENAME[] = "Android.PackageName";
-const char ANDROID_PACKAGE_INSTALLATION_STEP_ID[]
-    = "Qt4ProjectManager.AndroidPackageInstallationStep";
+const char ANDROID_PACKAGE_INSTALL_STEP_ID[] = "Qt4ProjectManager.AndroidPackageInstallationStep";
 const char ANDROID_BUILD_APK_ID[] = "QmakeProjectManager.AndroidBuildApkStep";
 const char ANDROID_DEPLOY_QT_ID[] = "Qt4ProjectManager.AndroidDeployQtStep";
 
 const char AndroidPackageSourceDir[] = "AndroidPackageSourceDir"; // QString
 const char AndroidDeploySettingsFile[] = "AndroidDeploySettingsFile"; // QString
 const char AndroidExtraLibs[] = "AndroidExtraLibs";  // QStringList
-// REMOVE ME
-const char AndroidArch[] = "AndroidArch"; // QString
+const char AndroidAbi[] = "AndroidAbi"; // QString
+const char AndroidAbis[] = "AndroidAbis"; // QStringList
+const char AndroidMkSpecAbis[] = "AndroidMkSpecAbis"; // QStringList
 const char AndroidSoLibPath[] = "AndroidSoLibPath"; // QStringList
 const char AndroidTargets[] = "AndroidTargets"; // QStringList
+const char AndroidApplicationArgs[] = "AndroidApplicationArgs"; // QString
+
+// For qbs support
 const char AndroidApk[] = "Android.APK"; // QStringList
 const char AndroidManifest[] = "Android.Manifest"; // QStringList
 
 const char AndroidNdkPlatform[] = "AndroidNdkPlatform"; //QString
 const char NdkLocation[] = "NdkLocation"; // FileName
 const char SdkLocation[] = "SdkLocation"; // FileName
-const char AndroidABIs[] = "AndroidABIs"; // QString
 
 // Android Device
 const Utils::Id AndroidSerialNumber = "AndroidSerialNumber";