diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-10 14:49:25 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-10 14:49:25 +0000 |
| commit | 8fe6b4d3ef03955c23a1d8816d4c947efbde381b (patch) | |
| tree | bb077d2bfa9c2d922eb83cb386859162aa3a63c1 /src/quick/items/qquickitem_p.h | |
| parent | bae22adafc3a6f5ff7f920e71c1542dc25cf1bab (diff) | |
| parent | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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 3bb4b2835c..4bff293657 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -305,6 +305,7 @@ public: void _q_resourceObjectDeleted(QObject *); void _q_windowChanged(QQuickWindow *w); + quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine); enum ChangeType { Geometry = 0x01, @@ -600,9 +601,6 @@ public: void setHasCursorInChild(bool hasCursor); void setHasHoverInChild(bool hasHover); - // recursive helper to let a visual parent mark its visual children - void markObjects(QV4::ExecutionEngine *e); - virtual void updatePolish() { } }; |