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

Android: Remove unused constants

Browse Source 
Clang warns about these.

Change-Id: I002d97356dd7b6401edc577b69978d5d17a1e404
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-08-27 12:04:14 +02:00
parent 5829b22b03
commit 52a52ca09f
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidconfigurations.cpp
View File

@@ -83,14 +83,12 @@ namespace {
const QLatin1String SettingsGroup("AndroidConfigurations"); const QLatin1String SettingsGroup("AndroidConfigurations");
const QLatin1String SDKLocationKey("SDKLocation"); const QLatin1String SDKLocationKey("SDKLocation");
const QLatin1String NDKLocationKey("NDKLocation"); const QLatin1String NDKLocationKey("NDKLocation");
const QLatin1String NDKToolchainVersionKey("NDKToolchainVersion");
const QLatin1String AntLocationKey("AntLocation"); const QLatin1String AntLocationKey("AntLocation");
const QLatin1String OpenJDKLocationKey("OpenJDKLocation"); const QLatin1String OpenJDKLocationKey("OpenJDKLocation");
const QLatin1String KeystoreLocationKey("KeystoreLocation"); const QLatin1String KeystoreLocationKey("KeystoreLocation");
const QLatin1String AutomaticKitCreationKey("AutomatiKitCreation"); const QLatin1String AutomaticKitCreationKey("AutomatiKitCreation");
const QLatin1String UseGradleKey("UseGradle"); const QLatin1String UseGradleKey("UseGradle");
const QLatin1String MakeExtraSearchDirectory("MakeExtraSearchDirectory"); const QLatin1String MakeExtraSearchDirectory("MakeExtraSearchDirectory");
const QLatin1String DefaultDevice("DefaultDevice");
const QLatin1String PartitionSizeKey("PartitionSize"); const QLatin1String PartitionSizeKey("PartitionSize");
const QLatin1String ToolchainHostKey("ToolchainHost"); const QLatin1String ToolchainHostKey("ToolchainHost");
@@ -114,7 +112,6 @@ namespace {
const QLatin1String Unknown("unknown"); const QLatin1String Unknown("unknown");
const QLatin1String keytoolName("keytool"); const QLatin1String keytoolName("keytool");
const QLatin1String jarsignerName("jarsigner");
const QLatin1String changeTimeStamp("ChangeTimeStamp"); const QLatin1String changeTimeStamp("ChangeTimeStamp");
static QString sdkSettingsFileName() static QString sdkSettingsFileName()

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -63,12 +63,6 @@ using namespace Android;
using namespace Android::Internal; using namespace Android::Internal;
const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage"); const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage");
const QLatin1String KeystoreLocationKey("KeystoreLocation");
const QLatin1String SignPackageKey("SignPackage");
const QLatin1String BuildTargetSdkKey("BuildTargetSdk");
const QLatin1String VerboseOutputKey("VerboseOutput");
const QLatin1String InputFile("InputFile");
const QLatin1String ProFilePathForInputFile("ProFilePathForInputFile");
const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES"); const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES");
const QLatin1String InstallFailedInconsistentCertificatesString2("INSTALL_FAILED_UPDATE_INCOMPATIBLE"); const QLatin1String InstallFailedInconsistentCertificatesString2("INSTALL_FAILED_UPDATE_INCOMPATIBLE");
const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep"); const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep");

1
src/plugins/android/androidmanager.cpp
View File

@@ -66,7 +66,6 @@
#include <QDomDocument> #include <QDomDocument>
namespace { namespace {
const QLatin1String AndroidDirName("android");
const QLatin1String AndroidManifestName("AndroidManifest.xml"); const QLatin1String AndroidManifestName("AndroidManifest.xml");
const QLatin1String AndroidLibsFileName("/res/values/libs.xml"); const QLatin1String AndroidLibsFileName("/res/values/libs.xml");
const QLatin1String AndroidDefaultPropertiesName("project.properties"); const QLatin1String AndroidDefaultPropertiesName("project.properties");

2
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
View File

@@ -59,8 +59,6 @@ namespace QmakeAndroidSupport {
namespace Internal { namespace Internal {
const Core::Id ANDROID_BUILD_APK_ID("QmakeProjectManager.AndroidBuildApkStep"); const Core::Id ANDROID_BUILD_APK_ID("QmakeProjectManager.AndroidBuildApkStep");
const QLatin1String ProFilePathForInputFile("ProFilePathForInputFile");
////////////////// //////////////////
// QmakeAndroidBuildApkStepFactory // QmakeAndroidBuildApkStepFactory