summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2022-01-27 18:04:05 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-28 06:24:01 +0000
commitc8de0a3f9cc9ad8ca6b00d2e84b6795aaef8072d (patch)
tree33155f95787f451c3bc4d684aa38ade289dbcbc3
parent477d47145865e43c795e7e580eba7f650375302a (diff)
downloadqtwebengine-c8de0a3f9cc9ad8ca6b00d2e84b6795aaef8072d.tar.gz
Guard against favicon provider being removed before View
Avoid using dangling pointer on view's destruction in case favicon provider was removed first by QML engine. Just use a QPointer since it's not used for anything much else internally in a WebEngineView. Fixes: QTBUG-100032 Change-Id: I0560798a02bed02b0aabee61e1b0ae41a6e87d8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 9392bce5380c5cc04a1e1b0ac15306ed67a7398e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/webenginequick/api/qquickwebengineview_p_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index 4647d671e..0f6eceb56 100644
--- a/src/webenginequick/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -207,7 +207,7 @@ private:
bool m_profileInitialized;
QWebEngineContextMenuRequest *m_contextMenuRequest;
QScopedPointer<QQuickWebEngineScriptCollection> m_scriptCollection;
- QQuickWebEngineFaviconProvider *m_faviconProvider = nullptr;
+ QPointer<QQuickWebEngineFaviconProvider> m_faviconProvider;
};
#ifndef QT_NO_ACCESSIBILITY