From ae55018548f11d70c41ee4213b9a037a1ad97000 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 6 Nov 2013 13:06:10 +0100 Subject: [PATCH] Android: Fix in source builds with Qt 5.2 Now the build directory is by default android-build, so by default the source and build directory don't clash anymore. Task-number: QTCREATORBUG-10661 Change-Id: I054bd3790f9bc9720536aac301bee192cb9f0429 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androidconstants.h | 2 ++ src/plugins/android/androiddeployqtstep.cpp | 3 ++- src/plugins/android/androidmanager.cpp | 2 +- src/plugins/android/androidpackageinstallationstep.cpp | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index 19dfd8ef537..f38f851251d 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -65,6 +65,8 @@ const char ANDROID_DEVICE_ID[] = "Android Device"; const char ANDROID_MANIFEST_MIME_TYPE[] = "application/vnd.google.android.android_manifest"; const char ANDROID_MANIFEST_EDITOR_ID[] = "Android.AndroidManifestEditor.Id"; const char ANDROID_MANIFEST_EDITOR_CONTEXT[] = "Android.AndroidManifestEditor.Id"; + +const char ANDROID_BUILDDIRECTORY[] = "android-build"; } // namespace Constants; } // namespace Android diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 4e9498ecdbb..76b284dc84d 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -34,6 +34,7 @@ #include "javaparser.h" #include "androidmanager.h" +#include "androidconstants.h" #include #include @@ -232,7 +233,7 @@ bool AndroidDeployQtStep::init() else if (m_deployAction == BundleLibrariesDeployment) deploymentMethod = QLatin1String("bundled"); - QString outputDir = bc->buildDirectory().appendPath(QLatin1String("android")).toString(); + QString outputDir = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString(); QStringList arguments; arguments << QLatin1String("--input") diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 78e15b11a85..e200e28dcaa 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -272,7 +272,7 @@ Utils::FileName AndroidManager::dirPath(ProjectExplorer::Target *target) { QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target->kit()); if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0)) - return target->activeBuildConfiguration()->buildDirectory().appendPath(AndroidDirName); + return target->activeBuildConfiguration()->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)); return Utils::FileName::fromString(target->project()->projectDirectory()).appendPath(AndroidDirName); } diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index f74cac0726b..00bb788e30a 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -29,6 +29,7 @@ #include "androidpackageinstallationstep.h" #include "androidmanager.h" +#include "androidconstants.h" #include #include @@ -69,7 +70,7 @@ bool AndroidPackageInstallationStep::init() if (m_androidDirectory == ProjectDirectory) dirPath = AndroidManager::dirPath(target()).toString(); else - dirPath = bc->buildDirectory().appendPath((QLatin1String("android"))).toString(); + dirPath = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString(); if (Utils::HostOsInfo::isWindowsHost()) if (bc->environment().searchInPath(QLatin1String("sh.exe")).isEmpty()) dirPath = QDir::toNativeSeparators(dirPath);