diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 22:19:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 22:19:17 +0200 |
| commit | bdb53d77d1806a06646d3721c22b40ecd03d6f6a (patch) | |
| tree | 1f8f20fb068753fa3c6f1af3bc1b18a57a54bf75 /Source/WebKit/qt/WidgetApi/qwebview.h | |
| parent | 5079a4fb1da63f00d089eac0d40a88bb0e0e45a4 (diff) | |
| parent | 8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (diff) | |
| download | qtwebkit-bdb53d77d1806a06646d3721c22b40ecd03d6f6a.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ib5bd1f44e83e29501eaa432ddb47320375f5079a
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebview.h')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h index 43439dfa5..ac0946773 100644 --- a/Source/WebKit/qt/WidgetApi/qwebview.h +++ b/Source/WebKit/qt/WidgetApi/qwebview.h @@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QWebView : public QWidget { Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints) Q_FLAGS(QPainter::RenderHints) public: - explicit QWebView(QWidget* parent = 0); + explicit QWebView(QWidget* parent = Q_NULLPTR); virtual ~QWebView(); QWebPage* page() const; @@ -104,7 +104,7 @@ public: void setRenderHints(QPainter::RenderHints hints); void setRenderHint(QPainter::RenderHint hint, bool enabled = true); - bool findText(const QString& subString, QWebPage::FindFlags options = 0); + bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags()); virtual bool event(QEvent*); |