diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-21 11:33:06 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-21 11:33:06 +0100 |
| commit | b44962c8bce5489deee289212282cdf2c89b425a (patch) | |
| tree | 796eeb5c5008a53d61e7cc970d90aed5e7d3b530 /src/webengine/api | |
| parent | 7a4324f5e4c3927b51e4176daf0d8ae6599c984a (diff) | |
| parent | 15ded5ca62f53a01f85a52326f0b335a8a012bbd (diff) | |
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Change-Id: Ifcf7423fa8d892ddad595300e33a09c7f63f5e6e
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebenginefaviconprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginefaviconprovider.cpp b/src/webengine/api/qquickwebenginefaviconprovider.cpp index fe8436d6c..b5ad6960a 100644 --- a/src/webengine/api/qquickwebenginefaviconprovider.cpp +++ b/src/webengine/api/qquickwebenginefaviconprovider.cpp @@ -152,7 +152,7 @@ QQuickWebEngineView *QQuickWebEngineFaviconProvider::viewForIconUrl(const QUrl & // latest WebEngineView which was raised an iconChanged signal. if (m_latestView) { QList<QUrl> *iconUrls = m_iconUrlMap[m_latestView]; - if (iconUrls->contains(iconUrl)) + if (iconUrls && iconUrls->contains(iconUrl)) return m_latestView; } |