diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java index b5604d4c479..0f146c1f45c 100644 --- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java @@ -154,11 +154,14 @@ class ExtractStyle { String dataDir = activity.getApplicationInfo().dataDir; m_stylePath = dataDir + "/qt-reserved-files/android-style/" + dpi + "/"; + if (extractOption.isEmpty()) + extractOption = "minimal"; + if (!extractOption.equals("default") && !extractOption.equals("full") && !extractOption.equals("minimal") && !extractOption.equals("none")) { Log.e(QtTAG, "Invalid extract_android_style option \"" + extractOption - + "\", defaulting to \"default\""); - extractOption = "default"; + + "\", defaulting to \"minimal\""); + extractOption = "minimal"; } // QTBUG-69810: The extraction code will trigger compatibility warnings on Android diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index b309db74772..21ceaacc2e4 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -36,10 +36,6 @@ - - - - diff --git a/tests/manual/permissions/android/AndroidManifest.xml b/tests/manual/permissions/android/AndroidManifest.xml index 44ed54390a9..041c920ad1a 100644 --- a/tests/manual/permissions/android/AndroidManifest.xml +++ b/tests/manual/permissions/android/AndroidManifest.xml @@ -43,10 +43,6 @@ - -