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/qwebpage.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/qwebpage.h')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h index 24fe1383e..a9c71fd42 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.h +++ b/Source/WebKit/qt/WidgetApi/qwebpage.h @@ -265,7 +265,7 @@ public: }; - explicit QWebPage(QObject *parent = 0); + explicit QWebPage(QObject *parent = Q_NULLPTR); ~QWebPage(); QWebFrame *mainFrame() const; @@ -317,7 +317,7 @@ public: QVariant inputMethodQuery(Qt::InputMethodQuery property) const; - bool findText(const QString &subString, FindFlags options = 0); + bool findText(const QString &subString, FindFlags options = FindFlags()); void setForwardUnsupportedContent(bool forward); bool forwardUnsupportedContent() const; @@ -383,7 +383,7 @@ public: }; - virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); + virtual bool extension(Extension extension, const ExtensionOption *option = Q_NULLPTR, ExtensionReturn *output = Q_NULLPTR); virtual bool supportsExtension(Extension extension) const; QWebPageAdapter* handle() const; |