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/Api/qwebpluginfactory.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/Api/qwebpluginfactory.h')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebpluginfactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/Api/qwebpluginfactory.h b/Source/WebKit/qt/Api/qwebpluginfactory.h index 24084fe18..26f855066 100644 --- a/Source/WebKit/qt/Api/qwebpluginfactory.h +++ b/Source/WebKit/qt/Api/qwebpluginfactory.h @@ -48,7 +48,7 @@ public: QList<MimeType> mimeTypes; }; - explicit QWebPluginFactory(QObject* parent = 0); + explicit QWebPluginFactory(QObject* parent = Q_NULLPTR); virtual ~QWebPluginFactory(); virtual QList<Plugin> plugins() const = 0; @@ -62,7 +62,7 @@ public: {}; class ExtensionReturn {}; - 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; private: |