From 87922f58fe7ed179f8eecc521f285a77030e6b48 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Tue, 14 Apr 2015 13:24:33 +0200
Subject: [PATCH] Android: Allow creating a avd without a sdcard

And make that the default. SdCards are not that useful, so
creating one by default is odd.

Change-Id: Iddb34e9e3387c9c4488f7b2bc11799cfc28c9a43
Task-number: QTCREATORBUG-13590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 src/plugins/android/addnewavddialog.ui        | 4 ++--
 src/plugins/android/androidconfigurations.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/android/addnewavddialog.ui b/src/plugins/android/addnewavddialog.ui
index f06986fa4c9..b5a0ba5ec75 100644
--- a/src/plugins/android/addnewavddialog.ui
+++ b/src/plugins/android/addnewavddialog.ui
@@ -95,13 +95,13 @@
         <string> MiB</string>
        </property>
        <property name="minimum">
-        <number>50</number>
+        <number>0</number>
        </property>
        <property name="maximum">
         <number>9999999</number>
        </property>
        <property name="value">
-        <number>200</number>
+        <number>0</number>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 1469afd7243..8df16e557e2 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -597,8 +597,9 @@ AndroidConfig::CreateAvdInfo AndroidConfig::createAVDImpl(CreateAvdInfo info, Fi
     arguments << QLatin1String("create") << QLatin1String("avd")
               << QLatin1String("-t") << info.target
               << QLatin1String("-n") << info.name
-              << QLatin1String("-b") << info.abi
-              << QLatin1String("-c") << QString::fromLatin1("%1M").arg(info.sdcardSize);
+              << QLatin1String("-b") << info.abi;
+    if (info.sdcardSize > 0)
+        arguments << QLatin1String("-c") << QString::fromLatin1("%1M").arg(info.sdcardSize);
     proc.start(androidToolPath.toString(), arguments);
     if (!proc.waitForStarted()) {
         info.error = QApplication::translate("AndroidConfig", "Could not start process \"%1 %2\"")