diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-17 20:42:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-17 20:42:46 +0100 |
| commit | 9477ba4e423276fe70e507ddbcc6e087def9f0ef (patch) | |
| tree | 93034da8c847f030916d53d6fecbff21e4699457 /src/qml/jsruntime/qv4engine_p.h | |
| parent | 48e2b2e6eb37f06c93c77bde89e8ae0610038a6f (diff) | |
| parent | 61447075954aab99b3abc9c78294e5966ae3b6ce (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2e3ba907a6afcaa69354a894259c7b7accf3e3ac
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index d21b623a1e..3b515791a4 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -445,7 +445,6 @@ public: Heap::QmlContext *qmlContext() const; QObject *qmlScopeObject() const; - ReturnedValue qmlSingletonWrapper(String *name); QQmlContextData *callingQmlContext() const; |