diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
| commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
| tree | 91493089f958b95138bdbd3f838188450e4349bb /src/webenginewidgets/api/qwebengineview.h | |
| parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
| parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
Diffstat (limited to 'src/webenginewidgets/api/qwebengineview.h')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index f7e846861..cb66bb75f 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -65,7 +65,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget { Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) public: - explicit QWebEngineView(QWidget* parent = 0); + explicit QWebEngineView(QWidget* parent = Q_NULLPTR); virtual ~QWebEngineView(); QWebEnginePage* page() const; @@ -95,10 +95,10 @@ public: void setZoomFactor(qreal factor); #ifdef Q_QDOC - void findText(const QString &subString, QWebEnginePage::FindFlags options = 0); + void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags()); void findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback); #else - void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); + void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); #endif virtual QSize sizeHint() const Q_DECL_OVERRIDE; |