diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-09-05 18:01:08 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-09-17 18:48:54 +0200 |
| commit | 9e8045def185e440b30be3bb04f76021851e60a8 (patch) | |
| tree | 0c9582b487aa9c3f58b13a9f9306b10a3d253249 /src/webenginewidgets/api/qwebengineview.cpp | |
| parent | f8dc90ff4face292f4056ca57e566a0aa0efc005 (diff) | |
Add widgets settings doc plus revive QWeb(Engine)View::settings
Also silence some warnings by tagging functions as reimplemented.
Change-Id: I0572e466709d433a44c7a154ff37e43178a6013f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebengineview.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 7104df747..8d2198998 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -199,6 +199,19 @@ void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlag page()->findText(subString, options, resultCallback); } +/*! + * \reimp + */ +QSize QWebEngineView::sizeHint() const +{ + return QSize(800, 600); +} + +QWebEngineSettings *QWebEngineView::settings() const +{ + return page()->settings(); +} + void QWebEngineView::stop() { page()->triggerAction(QWebEnginePage::Stop); @@ -236,6 +249,9 @@ void QWebEngineView::setZoomFactor(qreal factor) page()->setZoomFactor(factor); } +/*! + * \reimp + */ bool QWebEngineView::event(QEvent *ev) { Q_D(QWebEngineView); @@ -249,6 +265,9 @@ bool QWebEngineView::event(QEvent *ev) return QWidget::event(ev); } +/*! + * \reimp + */ void QWebEngineView::contextMenuEvent(QContextMenuEvent *event) { QMenu *menu = page()->createStandardContextMenu(); |