diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-02-06 12:12:43 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-02-06 17:23:42 +0200 |
| commit | ff6a6d3285c48d5e54bf03361115116f58461e33 (patch) | |
| tree | 7eb2ce205930359a94600354ca7a50c777c5f821 | |
| parent | 63c8c1e862ee7dcd98dfd0d786e65e1b4fa05267 (diff) | |
Android: fix style extraction when set to none
If extract_android_style meta data is set to none currently the app
still tries to extract full stlye and crashes. If this option is set
no style data should be extracted after this patch.
Pick-to: 6.7
Fixes: QTBUG-121667
Change-Id: I764e1eb6a582073196f991ca930d245d17a1f7e5
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| -rw-r--r-- | examples/corelib/platform/androidnotifier/android/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java | 3 |
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"; |