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/jsapi | |
| parent | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (diff) | |
| parent | 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.h | 2 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsengine_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h index 89642b6f20..3ba2b52e89 100644 --- a/src/qml/jsapi/qjsengine.h +++ b/src/qml/jsapi/qjsengine.h @@ -63,7 +63,7 @@ class Q_QML_EXPORT QJSEngine public: QJSEngine(); explicit QJSEngine(QObject *parent); - virtual ~QJSEngine(); + ~QJSEngine() override; QJSValue globalObject() const; diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h index 1ea1d77851..360c9df075 100644 --- a/src/qml/jsapi/qjsengine_p.h +++ b/src/qml/jsapi/qjsengine_p.h @@ -75,7 +75,7 @@ public: static QJSEnginePrivate* get(QV4::ExecutionEngine *e); QJSEnginePrivate() : mutex(QMutex::Recursive) {} - ~QJSEnginePrivate(); + ~QJSEnginePrivate() override; static void addToDebugServer(QJSEngine *q); static void removeFromDebugServer(QJSEngine *q); |