From e7db02e79eec24015fcc4c2d2bc56c8c40c50e42 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Thu, 31 Oct 2013 15:41:26 +0200
Subject: [PATCH] Remove android specific qmake variables.

Change-Id: Iba2b929ba70588ffcbcc9395501753521cfe5154
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
 .../features/android/android_deployment_settings.prf | 12 ------------
 src/android/java/AndroidManifest.xml                 |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf
index a903ed025d..5bc1fd14c9 100644
--- a/mkspecs/features/android/android_deployment_settings.prf
+++ b/mkspecs/features/android/android_deployment_settings.prf
@@ -47,18 +47,6 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-no-sdk {
     !isEmpty(ANDROID_PACKAGE_SOURCE_DIR): \
         FILE_CONTENT += "   \"android-package-source-directory\": $$emitString($$ANDROID_PACKAGE_SOURCE_DIR),"
 
-    !isEmpty(ANDROID_PACKAGE): \
-        FILE_CONTENT += "   \"android-package\": $$emitString($$ANDROID_PACKAGE),"
-
-    !isEmpty(ANDROID_MINIMUM_VERSION): \
-        FILE_CONTENT += "   \"android-minimum-version\": $$ANDROID_MINIMUM_VERSION,"
-
-    !isEmpty(ANDROID_TARGET_VERSION): \
-        FILE_CONTENT += "   \"android-target-version\": $$ANDROID_TARGET_VERSION,"
-
-    !isEmpty(ANDROID_APP_NAME): \
-        FILE_CONTENT += "   \"android-app-name\": $$emitString($$ANDROID_APP_NAME),"
-
     !isEmpty(ANDROID_EXTRA_LIBS): \
         FILE_CONTENT += "   \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ",")),"
 
diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml
index 6463793e0b..da34e4efac 100644
--- a/src/android/java/AndroidManifest.xml
+++ b/src/android/java/AndroidManifest.xml
@@ -34,7 +34,7 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <!-- %%INSERT_USES_SDK%% -->
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>