diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-24 17:49:26 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-24 17:52:47 +0000 |
| commit | 0d179cddf3fedbe1ae605f07e38532da6bafbfc5 (patch) | |
| tree | 7c5efec775cafaf46d3292bdaeb04ec433e8d29c | |
| parent | 02da875d27e84ff2ed7d491175e91e2cfce5fd6b (diff) | |
demobrowser: Fix meta object system warning
Do not redefine QWebEngineView::iconChanged.
This fixes the following warning:
QMetaObject::indexOfSignal: signal iconChanged(QIcon) from
QWebEngineView redefined in WebView
Change-Id: I2489bfcf9379200f9bfa24345b56679f138894fe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | examples/webenginewidgets/demobrowser/webview.cpp | 1 | ||||
| -rw-r--r-- | examples/webenginewidgets/demobrowser/webview.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp index e308196ab..a785ae48b 100644 --- a/examples/webenginewidgets/demobrowser/webview.cpp +++ b/examples/webenginewidgets/demobrowser/webview.cpp @@ -349,6 +349,7 @@ void WebView::setPage(WebPage *_page) connect(page(), SIGNAL(statusBarMessage(QString)), SLOT(setStatusBarText(QString))); #endif + 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); |