diff options
| author | Liang Qi <[email protected]> | 2016-04-27 08:47:35 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-04-27 08:47:35 +0200 |
| commit | da374438be8f34f746f359aa39ae6c59fd1c4854 (patch) | |
| tree | 2f3e2a2b93b39dfb825339c98580f23e824fad0e /src/quick/items/qquickpainteditem.h | |
| parent | 1be53f4e143d417d60cd1f9a292193dab59b5b20 (diff) | |
| parent | 2e6f7f362e62c3285e7d395aca607502c8e8160e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickimagebase.cpp
src/imports/layouts/plugin.cpp
Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
Diffstat (limited to 'src/quick/items/qquickpainteditem.h')
| -rw-r--r-- | src/quick/items/qquickpainteditem.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h index f9e3c91a42..e8b471ac01 100644 --- a/src/quick/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.h @@ -121,6 +121,7 @@ protected: QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = Q_NULLPTR); QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; void releaseResources() Q_DECL_OVERRIDE; + void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE; private Q_SLOTS: void invalidateSceneGraph(); |