forked from qt-creator/qt-creator
Android: Say hello to gradle!
Switching from Ant to Gradle brings lots of advantages: - it is way faster when rebuilding (25-50% faster than ant). - it enables first class Android Studio integration. - adding Android Extras libs (e.g. Google Play services, OBB, etc.) to your project is now painless. [ChangeLog][Android] Added Gradle support to build the APK. Change-Id: Iee492954f8ffb2c22e6ab14a8a25faf644de9a51 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -84,6 +84,7 @@ namespace {
|
||||
const QLatin1String OpenJDKLocationKey("OpenJDKLocation");
|
||||
const QLatin1String KeystoreLocationKey("KeystoreLocation");
|
||||
const QLatin1String AutomaticKitCreationKey("AutomatiKitCreation");
|
||||
const QLatin1String UseGradleKey("UseGradle");
|
||||
const QLatin1String MakeExtraSearchDirectory("MakeExtraSearchDirectory");
|
||||
const QLatin1String DefaultDevice("DefaultDevice");
|
||||
const QLatin1String PartitionSizeKey("PartitionSize");
|
||||
@@ -181,6 +182,7 @@ void AndroidConfig::load(const QSettings &settings)
|
||||
m_sdkLocation = FileName::fromString(settings.value(SDKLocationKey).toString());
|
||||
m_ndkLocation = FileName::fromString(settings.value(NDKLocationKey).toString());
|
||||
m_antLocation = FileName::fromString(settings.value(AntLocationKey).toString());
|
||||
m_useGradle = settings.value(UseGradleKey, true).toBool();
|
||||
m_openJDKLocation = FileName::fromString(settings.value(OpenJDKLocationKey).toString());
|
||||
m_keystoreLocation = FileName::fromString(settings.value(KeystoreLocationKey).toString());
|
||||
m_toolchainHost = settings.value(ToolchainHostKey).toString();
|
||||
@@ -214,7 +216,8 @@ void AndroidConfig::load(const QSettings &settings)
|
||||
}
|
||||
|
||||
AndroidConfig::AndroidConfig()
|
||||
: m_availableSdkPlatformsUpToDate(false),
|
||||
: m_useGradle(true),
|
||||
m_availableSdkPlatformsUpToDate(false),
|
||||
m_NdkInformationUpToDate(false)
|
||||
{
|
||||
|
||||
@@ -230,6 +233,7 @@ void AndroidConfig::save(QSettings &settings) const
|
||||
settings.setValue(SDKLocationKey, m_sdkLocation.toString());
|
||||
settings.setValue(NDKLocationKey, m_ndkLocation.toString());
|
||||
settings.setValue(AntLocationKey, m_antLocation.toString());
|
||||
settings.setValue(UseGradleKey, m_useGradle);
|
||||
settings.setValue(OpenJDKLocationKey, m_openJDKLocation.toString());
|
||||
settings.setValue(KeystoreLocationKey, m_keystoreLocation.toString());
|
||||
settings.setValue(PartitionSizeKey, m_partitionSize);
|
||||
@@ -912,6 +916,16 @@ void AndroidConfig::setAutomaticKitCreation(bool b)
|
||||
m_automaticKitCreation = b;
|
||||
}
|
||||
|
||||
bool AndroidConfig::useGrandle() const
|
||||
{
|
||||
return m_useGradle;
|
||||
}
|
||||
|
||||
void AndroidConfig::setUseGradle(bool b)
|
||||
{
|
||||
m_useGradle = b;
|
||||
}
|
||||
|
||||
///////////////////////////////////
|
||||
// AndroidConfigurations
|
||||
///////////////////////////////////
|
||||
|
Reference in New Issue
Block a user