diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-18 16:29:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 18:47:26 +0000 |
commit | 3206e85c0f7ee3de9953977ffbb0137de0ee01f3 (patch) | |
tree | bf6aef148f8ad041b4183d248adda585d48aaab5 /src/webenginewidgets/api/qwebenginepage.h | |
parent | f4b806ffbc2f11a5a64fab2856dfe68ae7d603c8 (diff) |
Silence zero-as-null-pointer=constant warnings
This appears to have been added to headerclean and is now preventing us
from integrating.
Change-Id: I7c25a85c0d62c945d4f4a68f559000fab8c880cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index 811003dd0..911bfe917 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -175,8 +175,8 @@ public: KilledTerminationStatus }; - explicit QWebEnginePage(QObject *parent = 0); - QWebEnginePage(QWebEngineProfile *profile, QObject *parent = 0); + explicit QWebEnginePage(QObject *parent = Q_NULLPTR); + QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR); ~QWebEnginePage(); QWebEngineHistory *history() const; @@ -195,10 +195,10 @@ public: virtual bool event(QEvent*); #ifdef Q_QDOC - void findText(const QString &subString, FindFlags options = 0); + void findText(const QString &subString, FindFlags options = FindFlags()); void findText(const QString &subString, FindFlags options, FunctorOrLambda resultCallback); #else - void findText(const QString &subString, FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); + void findText(const QString &subString, FindFlags options = FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); #endif QMenu *createStandardContextMenu(); |