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>
This commit is contained in:
Assam Boudjelthia 2024-02-06 12:12:43 +02:00
parent 63c8c1e862
commit ff6a6d3285
2 changed files with 3 additions and 4 deletions

View File

@ -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>

View File

@ -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";