qt6.qtdeclarative: refresh patches for qt 6.6.0

This commit is contained in:
Nick Cao 2023-10-10 11:15:09 -04:00
parent 76e234836a
commit cced34436c
No known key found for this signature in database

View file

@ -1,13 +1,29 @@
From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 10 Oct 2023 11:12:27 -0400
Subject: [PATCH] qtdeclarative: disable qml disk cache
---
src/qml/jsruntime/qv4engine.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 852cde9e..165f1b57 100644 index d1b4c4fff6..50f8a07420 100644
--- a/src/qml/jsruntime/qv4engine.cpp --- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp
@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul @@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const
bool ExecutionEngine::diskCacheEnabled() const
{ {
- return (!disableDiskCache() && !debugger()) || forceDiskCache(); if (forceDiskCache())
+ return forceDiskCache(); return DiskCache::Enabled;
- if (disableDiskCache() || debugger())
- return DiskCache::Disabled;
- static const DiskCacheOptions options = qmlGetConfigOption<
- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE");
- return options;
+ return DiskCache::Disabled;
} }
void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, void ExecutionEngine::callInContext(QV4::Function *function, QObject *self,
--
2.42.0