diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:08 +0100 |
| commit | a2c3b32d08ed24279609a8c01b09c1147a9ff6b9 (patch) | |
| tree | a338bf45761158d616df7e912d86144ee9abe300 /src/webchannel/qqmlwebchannel.h | |
| parent | a9bad172f62fe1dda280df5477a8b7c1bd57690d (diff) | |
| parent | 64a106da72796377bbff5cce0ecc5a379b105498 (diff) | |
| download | qtwebchannel-a2c3b32d08ed24279609a8c01b09c1147a9ff6b9.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ifb2b9cc762b5c75f1ec3bf47c607906fdfef9bd1
Diffstat (limited to 'src/webchannel/qqmlwebchannel.h')
| -rw-r--r-- | src/webchannel/qqmlwebchannel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webchannel/qqmlwebchannel.h b/src/webchannel/qqmlwebchannel.h index 98d10d4..d6b7bb9 100644 --- a/src/webchannel/qqmlwebchannel.h +++ b/src/webchannel/qqmlwebchannel.h @@ -59,7 +59,7 @@ class Q_WEBCHANNEL_EXPORT QQmlWebChannel : public QWebChannel Q_PROPERTY( QQmlListProperty<QObject> registeredObjects READ registeredObjects ) public: - explicit QQmlWebChannel(QObject *parent = 0); + explicit QQmlWebChannel(QObject *parent = Q_NULLPTR); virtual ~QQmlWebChannel(); Q_INVOKABLE void registerObjects(const QVariantMap &objects); |