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/Api/qwebpluginfactory.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/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: |