diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:00:13 +0200 |
| commit | 257319079562368b6ee731f54e3f69647c3417b7 (patch) | |
| tree | 231137a8fecdf1405eedb631bc3008a630cf9e16 /src/qml/qml/qqmltypeloader.cpp | |
| parent | 7ecc96305f5ec0ed093e2e1b182cb85b71609bcd (diff) | |
| parent | aa3d088e3dbc6e93620310cf8de0782fbb2b2ee8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iaa7dbbe9926d25cfb1b1c51e7013e58cb71d86b5
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 997490361c..c2870396b0 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -707,14 +707,9 @@ bool QQmlTypeLoader::Blob::isDebugging() const return typeLoader()->engine()->handle()->debugger() != nullptr; } -bool QQmlTypeLoader::Blob::diskCacheDisabled() +bool QQmlTypeLoader::Blob::diskCacheEnabled() const { - return disableDiskCache(); -} - -bool QQmlTypeLoader::Blob::diskCacheForced() -{ - return forceDiskCache(); + return (!disableDiskCache() || forceDiskCache()) && !isDebugging(); } bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer<QQmlQmldirData> &data, QList<QQmlError> *errors) |