diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2025-02-04 14:55:28 +0800 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:38 +0200 |
| commit | 347e1f673c27072216d21708d682d3496ccf5b5c (patch) | |
| tree | 15bc63e6aa21e856518d1532b58303e42e624a26 /gnu/packages/patches/qtdeclarative-disable-qmlcache.patch | |
| parent | 714a4a57262926e3f1a33cf39ce9d3dffd97bab4 (diff) | |
gnu: qtdeclarative: Update to 6.8.2.
* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Adjust for 6.8.2.
* gnu/packages/qt.scm (qtdeclarative): Update to 6.8.2.
[arguments]: Skip failing test.
Change-Id: I665d373498814c30001138629fba4ab826b7f643
Diffstat (limited to 'gnu/packages/patches/qtdeclarative-disable-qmlcache.patch')
| -rw-r--r-- | gnu/packages/patches/qtdeclarative-disable-qmlcache.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index df76fab910..f6c3756a81 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -14,7 +14,7 @@ diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const +@@ -2246,11 +2246,5 @@ ExecutionEngine::DiskCacheOptions Execut { if (forceDiskCache()) return DiskCache::Enabled; @@ -22,10 +22,8 @@ index d1b4c4fff6..50f8a07420 100644 - return DiskCache::Disabled; - static const DiskCacheOptions options = qmlGetConfigOption< - DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); -- return options; +- return hasPreview.loadAcquire() +- ? (options & ~DiskCacheOptions(DiskCache::Aot)) // Disable AOT if preview enabled +- : options; + return DiskCache::Disabled; } - - void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, --- -2.42.0 |