diff --git a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml index 1936f901083..a77ed4ab12f 100644 --- a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml +++ b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml @@ -41,10 +41,6 @@ - - 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 b17293c905b..6780634317a 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";