diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 09:48:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-31 13:08:52 +0000 |
| commit | 9d77fecb32d6e5f25481fcd58230cb4e4b40a294 (patch) | |
| tree | e584de69822d74f13b091c66cf87d3107e8bd6b3 /examples | |
| parent | 0e54a359228ed6a6963580e323ab4311179d0f78 (diff) | |
| parent | f9e951d0946fe0fcd51e9015108f92c46ecc8138 (diff) | |
| download | qtwebengine-9d77fecb32d6e5f25481fcd58230cb4e4b40a294.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/webview.cpp | 3 | ||||
| -rw-r--r-- | examples/webenginewidgets/demobrowser/webview.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp index 633b72bf1..a785ae48b 100644 --- a/examples/webenginewidgets/demobrowser/webview.cpp +++ b/examples/webenginewidgets/demobrowser/webview.cpp @@ -349,8 +349,7 @@ void WebView::setPage(WebPage *_page) connect(page(), SIGNAL(statusBarMessage(QString)), SLOT(setStatusBarText(QString))); #endif - connect(page(), SIGNAL(loadingUrl(QUrl)), - this, SIGNAL(urlChanged(QUrl))); + disconnect(page(), &QWebEnginePage::iconChanged, this, &WebView::iconChanged); connect(page(), SIGNAL(iconChanged(QIcon)), this, SLOT(onIconChanged(QIcon))); connect(page(), &WebPage::featurePermissionRequested, this, &WebView::onFeaturePermissionRequested); diff --git a/examples/webenginewidgets/demobrowser/webview.h b/examples/webenginewidgets/demobrowser/webview.h index e3df8f795..8cb502fd1 100644 --- a/examples/webenginewidgets/demobrowser/webview.h +++ b/examples/webenginewidgets/demobrowser/webview.h @@ -111,9 +111,6 @@ protected: void contextMenuEvent(QContextMenuEvent *event); void wheelEvent(QWheelEvent *event); -signals: - void iconChanged(const QIcon &icon); - private slots: void setProgress(int progress); void loadFinished(bool success); |