diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-12-09 12:04:52 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-12-10 12:22:30 +0100 |
| commit | c0b59369ab45a78e4407633365a52c1a9255512c (patch) | |
| tree | f3c94857667de0d58f83d5827789bc35f7756a3e /src/qml/jsruntime/qv4engine.cpp | |
| parent | c1c4a874e31ba108a3600fbbb0aee7fc0bf34601 (diff) | |
Respect QML_DISABLE_DISK_CACHE also for caches built into the binary
Previously it would only disable loading of separate cache files.
Change-Id: Iae92fc03d2e5566ef7dc44a6730b788b7512fd3d
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 1085b81ab7..320dc15a15 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -142,6 +142,9 @@ Q_DECLARE_METATYPE(QList<int>) QT_BEGIN_NAMESPACE +DEFINE_BOOL_CONFIG_OPTION(disableDiskCache, QML_DISABLE_DISK_CACHE); +DEFINE_BOOL_CONFIG_OPTION(forceDiskCache, QML_FORCE_DISK_CACHE); + using namespace QV4; static QBasicAtomicInt engineSerial = Q_BASIC_ATOMIC_INITIALIZER(1); @@ -1957,9 +1960,13 @@ ReturnedValue ExecutionEngine::global() QQmlRefPointer<ExecutableCompilationUnit> ExecutionEngine::compileModule(const QUrl &url) { QQmlMetaType::CachedUnitLookupError cacheError = QQmlMetaType::CachedUnitLookupError::NoError; - if (const QQmlPrivate::CachedQmlUnit *cachedUnit = QQmlMetaType::findCachedCompilationUnit(url, &cacheError)) { + if (const QQmlPrivate::CachedQmlUnit *cachedUnit = diskCacheEnabled() + ? QQmlMetaType::findCachedCompilationUnit(url, &cacheError) + : nullptr) { return ExecutableCompilationUnit::create( - QV4::CompiledData::CompilationUnit(cachedUnit->qmlData, cachedUnit->aotCompiledFunctions, url.fileName(), url.toString())); + QV4::CompiledData::CompilationUnit( + cachedUnit->qmlData, cachedUnit->aotCompiledFunctions, + url.fileName(), url.toString())); } QFile f(QQmlFile::urlToLocalFileOrQrc(url)); @@ -2039,6 +2046,11 @@ QQmlRefPointer<ExecutableCompilationUnit> ExecutionEngine::loadModule(const QUrl return newModule; } +bool ExecutionEngine::diskCacheEnabled() const +{ + return (!disableDiskCache() && !debugger()) || forceDiskCache(); +} + void ExecutionEngine::initQmlGlobalObject() { initializeGlobal(); |