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 | |
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
-rw-r--r-- | src/webchannel/qqmlwebchannel.h | 2 | ||||
-rw-r--r-- | src/webchannel/qwebchannel.h | 4 | ||||
-rw-r--r-- | src/webchannel/qwebchannelabstracttransport.h | 2 | ||||
-rw-r--r-- | src/webchannel/webchannel.pro | 4 |
4 files changed, 6 insertions, 6 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); diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index b72b1a2..44dd8b6 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -57,7 +57,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); @@ -78,7 +78,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; diff --git a/src/webchannel/qwebchannelabstracttransport.h b/src/webchannel/qwebchannelabstracttransport.h index 56633db..ecac588 100644 --- a/src/webchannel/qwebchannelabstracttransport.h +++ b/src/webchannel/qwebchannelabstracttransport.h @@ -50,7 +50,7 @@ class Q_WEBCHANNEL_EXPORT QWebChannelAbstractTransport : public QObject { Q_OBJECT public: - explicit QWebChannelAbstractTransport(QObject *parent = 0); + explicit QWebChannelAbstractTransport(QObject *parent = Q_NULLPTR); virtual ~QWebChannelAbstractTransport(); public Q_SLOTS: diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index 931ee03..9c555e7 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -2,8 +2,6 @@ TARGET = QtWebChannel QT = core-private CONFIG += warn_on strict_flags -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtwebchannel.qdocconf RESOURCES += \ @@ -44,3 +42,5 @@ qtHaveModule(qml) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) |