diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:17:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:17:24 +0200 |
| commit | 9b6d55ddf361f14c05c2965b29184a95e3c6a989 (patch) | |
| tree | a1b4327662b257f4d18541ed136062d3bc38b229 /src/quick/items/qquickanimatedimage_p_p.h | |
| parent | 9a7cf067a178c7a08a7ed9f2c6253e1feade5569 (diff) | |
| parent | 9530a6a8744e9eb2b4ed947b528ab7c51d8c360f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3c6a93917cb46868cdb9dd50566b90c70f67102e
Diffstat (limited to 'src/quick/items/qquickanimatedimage_p_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index 9474254252..6d32f1071f 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_p.h @@ -66,7 +66,7 @@ class QQuickAnimatedImagePrivate : public QQuickImagePrivate public: QQuickAnimatedImagePrivate() - : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0), redirectCount(0), oldPlaying(false) + : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0), redirectCount(0), oldPlaying(false), currentSourceSize(0, 0) { } @@ -80,6 +80,7 @@ public: int redirectCount; bool oldPlaying; QMap<int, QQuickPixmap *> frameMap; + QSize currentSourceSize; }; QT_END_NAMESPACE |