diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 2 | ||||
-rw-r--r-- | src/webchannel/signalhandler_p.h | 2 | ||||
-rw-r--r-- | tests/auto/qml/testtransport.h | 2 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.cpp | 2 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index f2b6bef..31a134c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.10.1 +MODULE_VERSION = 5.11.0 diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index 830e510..d02a933 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -218,7 +218,7 @@ public Q_SLOTS: void handleMessage(const QJsonObject &message, QWebChannelAbstractTransport *transport); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: friend class QQmlWebChannelPrivate; diff --git a/src/webchannel/signalhandler_p.h b/src/webchannel/signalhandler_p.h index 9bcb071..27afadb 100644 --- a/src/webchannel/signalhandler_p.h +++ b/src/webchannel/signalhandler_p.h @@ -94,7 +94,7 @@ public: * * Custom implementation of qt_metacall which calls dispatch() for connected signals. */ - int qt_metacall(QMetaObject::Call call, int methodId, void **args) Q_DECL_OVERRIDE; + int qt_metacall(QMetaObject::Call call, int methodId, void **args) override; /** * Reset all connections, useful for benchmarks. diff --git a/tests/auto/qml/testtransport.h b/tests/auto/qml/testtransport.h index 972bcd8..5c533ae 100644 --- a/tests/auto/qml/testtransport.h +++ b/tests/auto/qml/testtransport.h @@ -39,7 +39,7 @@ class TestTransport : public QWebChannelAbstractTransport public: explicit TestTransport(QObject *parent = 0); - virtual void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + virtual void sendMessage(const QJsonObject &message) override; Q_INVOKABLE void receiveMessage(const QString &message); diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index 436a38e..b62a596 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -47,7 +47,7 @@ class TestEngineTransport : public QWebChannelAbstractTransport Q_OBJECT public: TestEngineTransport(TestJSEngine *); - void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + void sendMessage(const QJsonObject &message) override; Q_INVOKABLE void channelSetupReady(); Q_INVOKABLE void send(const QByteArray &message); diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index 85a9f39..85846e7 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -60,7 +60,7 @@ public: } public slots: - void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE + void sendMessage(const QJsonObject &message) override { mMessagesSent.push_back(message); } |