diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-10 09:28:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-10 16:01:48 +0200 |
| commit | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (patch) | |
| tree | 5bf934c323dcafb67cb508ace579110191ad782d /src/quick/items/qquickitem_p.h | |
| parent | a6be2d77aa6dc9f834b971eaff749a02cf982525 (diff) | |
| parent | fff4477661ae240c43088fa6d9069ccf969dbee8 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/quick/quickwidgets/quickwidget/main.cpp
src/qml/jsruntime/qv4jsonobject.cpp
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/jsruntime/qv4qobjectwrapper_p.h
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlpropertycache_p.h
src/quick/items/qquickanimatedsprite.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem.h
src/quick/items/qquickitem_p.h
src/quick/items/qquickview_p.h
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgdefaultrendercontext.cpp
Change-Id: I172c6fbff97208f21ed4c8b6db3d1747a889f22b
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 d1511285a9..49a674f2c6 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -300,6 +300,7 @@ public: void _q_resourceObjectDeleted(QObject *); void _q_windowChanged(QQuickWindow *w); + quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine); enum ChangeType { Geometry = 0x01, @@ -593,9 +594,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() { } }; |