diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-10-04 12:27:15 +0200 |
| commit | 0d2fad48fcc50fc3bec2401515b64f966e62c473 (patch) | |
| tree | ed70612fe1069c681d64aaa63f35034504adc12d /src/quick/items/qquickitem_p.h | |
| parent | e4134cfd8086a78c61a46fdfb908ade27c8d9840 (diff) | |
| parent | 3763008370833508104dbf2ed8296e8925207563 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I48764527fa1ab6d8d59c24552394459b1cdc58ee
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index fed3e88b68..8cda5f89c6 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -302,6 +302,7 @@ public: void _q_resourceObjectDeleted(QObject *); void _q_windowChanged(QQuickWindow *w); + quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine); enum ChangeType { Geometry = 0x01, @@ -605,9 +606,6 @@ public: virtual void mirrorChange() {} void setHasCursorInChild(bool hasCursor); - - // recursive helper to let a visual parent mark its visual children - void markObjects(QV4::ExecutionEngine *e); }; /* |