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>

4 files changed, 26 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h
index cf950582f..5d3ba8ce3 100644
--- a/src/webenginewidgets/api/qwebenginehistory.h
+++ b/src/webenginewidgets/api/qwebenginehistory.h
@@ -104,7 +104,7 @@ private:
     ~QWebEngineHistory();
 
     Q_DISABLE_COPY(QWebEngineHistory)
-    Q_DECLARE_PRIVATE(QWebEngineHistory);
+    Q_DECLARE_PRIVATE(QWebEngineHistory)
     QScopedPointer<QWebEngineHistoryPrivate> d_ptr;
 
     friend QWEBENGINEWIDGETS_EXPORT QDataStream& operator>>(QDataStream&, QWebEngineHistory&);
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 543e0c4ab..8c3c2bb45 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -583,6 +583,9 @@ void QWebEnginePage::findText(const QString &subString, FindFlags options, const
     }
 }
 
+/*!
+ * \reimp
+ */
 bool QWebEnginePage::event(QEvent *e)
 {
     return QObject::event(e);
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();
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index cc828482c..3e40ca18f 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 class QContextMenuEvent;
 class QUrl;
 class QWebEnginePage;
+class QWebEngineSettings;
 class QWebEngineViewPrivate;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
@@ -90,7 +91,8 @@ public:
 
     void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 
-    virtual QSize sizeHint() const { return QSize(800, 600); }
+    virtual QSize sizeHint() const Q_DECL_OVERRIDE;
+    QWebEngineSettings *settings() const;
 
 public Q_SLOTS:
     void stop();