diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-23 10:51:25 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-24 12:11:39 +0200 |
| commit | 31be482e740a6aec1243eb7ba3d865b9d4050641 (patch) | |
| tree | c33076717672c9418ba18a26f7ebd3ca15289311 /src/qml/qml/qqmltypeloader.cpp | |
| parent | fbc463e84d5cc6012953140c93f6b18f78e66bf8 (diff) | |
QML: Consistently check for debugger before loading cache files
In debug mode we don't want to load cache files.
Fixes: QTBUG-79443
Change-Id: Ie3e2c70d54e66f24846070aee952a86934099695
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
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 62007effdd..c6c3ee5523 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -703,14 +703,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) |