summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2022-01-27 18:04:05 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2022-01-28 00:43:03 +0100
commit9392bce5380c5cc04a1e1b0ac15306ed67a7398e (patch)
treec2976ad83d94b81a84154156372fdaaad5e3dfbb
parent8b5e3a46f253cd82dc48bc20c4233f1bf79fcb87 (diff)
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. Pick-to: 6.2 6.3 Fixes: QTBUG-100032 Change-Id: I0560798a02bed02b0aabee61e1b0ae41a6e87d8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-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