diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:33 +0200 |
| commit | 01fa9be55572ddb3f69befc68475ed09241eabdf (patch) | |
| tree | 03e177b36123aaf32b287eda215014e08b3d269b /Source/WebKit/qt/WidgetApi/qgraphicswebview.h | |
| parent | 2e8517924b70a778463e463873eb3d8d0b623eed (diff) | |
| parent | a750b262b856178eee47d546944bd095662dccf7 (diff) | |
| download | qtwebkit-5.7.0.tar.gz | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0
Change-Id: Id8fd457ab1eb501f8f5622cb5f7d88c352e3758f
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*); |