diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
commit | bf0603fd03ade413036c7dba1ffe0e7ac9364fc9 (patch) | |
tree | b6329f629c5c0a19ca419671ee328725daec699f /src/qml/debugger | |
parent | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (diff) | |
parent | 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca
Diffstat (limited to 'src/qml/debugger')
-rw-r--r-- | src/qml/debugger/qqmlabstractprofileradapter_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugconnector_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h index 4a01c271ca..f39f8fccd2 100644 --- a/src/qml/debugger/qqmlabstractprofileradapter_p.h +++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h @@ -70,7 +70,7 @@ public: QQmlAbstractProfilerAdapter(QObject *parent = nullptr) : QObject(parent), service(nullptr), waiting(true), featuresEnabled(0) {} - virtual ~QQmlAbstractProfilerAdapter() {} + ~QQmlAbstractProfilerAdapter() override {} void setService(QQmlProfilerService *new_service) { service = new_service; } virtual qint64 sendMessages(qint64 until, QList<QByteArray> &messages) = 0; diff --git a/src/qml/debugger/qqmldebugconnector_p.h b/src/qml/debugger/qqmldebugconnector_p.h index cead6af338..d1ad90adfd 100644 --- a/src/qml/debugger/qqmldebugconnector_p.h +++ b/src/qml/debugger/qqmldebugconnector_p.h @@ -126,7 +126,7 @@ class Q_QML_PRIVATE_EXPORT QQmlDebugConnectorFactory : public QObject { Q_OBJECT public: virtual QQmlDebugConnector *create(const QString &key) = 0; - ~QQmlDebugConnectorFactory(); + ~QQmlDebugConnectorFactory() override; }; #define QQmlDebugConnectorFactory_iid "org.qt-project.Qt.QQmlDebugConnectorFactory" diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index e9f7d2d396..c52ba90a79 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -69,7 +69,7 @@ class Q_QML_PRIVATE_EXPORT QQmlDebugService : public QObject Q_DECLARE_PRIVATE(QQmlDebugService) public: - ~QQmlDebugService(); + ~QQmlDebugService() override; const QString &name() const; float version() const; |