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. Fixes: QTBUG-121667 Change-Id: I764e1eb6a582073196f991ca930d245d17a1f7e5 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit ff6a6d3285c48d5e54bf03361115116f58461e33) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
ae8a5adb96
commit
8c5ea5b368
@ -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>
|
||||
|
@ -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";
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user