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/qgraphicswebview.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/qgraphicswebview.h')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qgraphicswebview.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h index c9e61f75a..0d990086f 100644 --- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h +++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h @@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget { Q_FLAGS(QPainter::RenderHints) public: - explicit QGraphicsWebView(QGraphicsItem* parent = 0); + explicit QGraphicsWebView(QGraphicsItem* parent = Q_NULLPTR); ~QGraphicsWebView(); QWebPage* page() const; @@ -84,7 +84,7 @@ public: QAction* pageAction(QWebPage::WebAction action) const; void triggerPageAction(QWebPage::WebAction action, bool checked = false); - bool findText(const QString& subString, QWebPage::FindFlags options = 0); + bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags()); bool resizesToContents() const; void setResizesToContents(bool enabled); @@ -94,7 +94,7 @@ public: virtual void setGeometry(const QRectF& rect); virtual void updateGeometry(); - virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0); + virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR); virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value); virtual bool event(QEvent*); |