diff options
| author | Liang Qi <[email protected]> | 2016-09-30 00:16:40 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-09-30 00:16:40 +0200 |
| commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
| tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/quick/items/qquickanimatedsprite_p.h | |
| parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
| parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/quick/items/qquickanimatedsprite_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedsprite_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 1e5981c1a4..9d8b4dad40 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -366,6 +366,7 @@ protected: void componentComplete() Q_DECL_OVERRIDE; QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; private: + void maybeUpdate(); bool isCurrentFrameChangedConnected(); void prepareNextFrame(QSGGeometryNode *node); void reloadImage(); |