summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/corelib/platform/androidnotifier/android/AndroidManifest.xml4
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
index 1936f90108..a77ed4ab12 100644
--- a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
+++ b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
@@ -41,10 +41,6 @@
<meta-data
android:name="android.app.background_running"
android:value="false"/>
-
- <meta-data
- android:name="android.app.extract_android_style"
- android:value="none" />
</activity>
</application>
</manifest>
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 b17293c905..6780634317 100644
--- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -154,6 +154,9 @@ class ExtractStyle {
String dataDir = context.getApplicationInfo().dataDir;
m_stylePath = dataDir + "/qt-reserved-files/android-style/" + dpi + "/";
+ if (extractOption.equals("none"))
+ return m_stylePath;
+
if (extractOption.isEmpty())
extractOption = "minimal";