diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 15:55:12 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 14:23:44 +0000 |
| commit | 64a106da72796377bbff5cce0ecc5a379b105498 (patch) | |
| tree | 0872edebdefa032887415fc918cad801ff695c34 /src/webchannel/qwebchannel.h | |
| parent | 330ed4783cce75f5fb86c04ebbdfa7e7b09c4e7b (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I972f844bd5845f4d7d88a14ff1b358c8c2b2643d
Task-number: QTBUG-45291
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src/webchannel/qwebchannel.h')
| -rw-r--r-- | src/webchannel/qwebchannel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index d32d017..40621f2 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -51,7 +51,7 @@ class Q_WEBCHANNEL_EXPORT QWebChannel : public QObject Q_DISABLE_COPY(QWebChannel) Q_PROPERTY(bool blockUpdates READ blockUpdates WRITE setBlockUpdates NOTIFY blockUpdatesChanged) public: - explicit QWebChannel(QObject *parent = 0); + explicit QWebChannel(QObject *parent = Q_NULLPTR); ~QWebChannel(); void registerObjects(const QHash<QString, QObject*> &objects); @@ -72,7 +72,7 @@ public Q_SLOTS: private: Q_DECLARE_PRIVATE(QWebChannel) - QWebChannel(QWebChannelPrivate &dd, QObject *parent = 0); + QWebChannel(QWebChannelPrivate &dd, QObject *parent = Q_NULLPTR); Q_PRIVATE_SLOT(d_func(), void _q_transportDestroyed(QObject*)) friend class QMetaObjectPublisher; |