diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
tree | 53190472453390810c47b9b5a47b23188a00267e /src/quick/items/qquickimagebase_p_p.h | |
parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'src/quick/items/qquickimagebase_p_p.h')
-rw-r--r-- | src/quick/items/qquickimagebase_p_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h index ebdf352e4e..cffe709116 100644 --- a/src/quick/items/qquickimagebase_p_p.h +++ b/src/quick/items/qquickimagebase_p_p.h @@ -62,9 +62,11 @@ public: : status(QQuickImageBase::Null), progress(0.0), devicePixelRatio(1.0), + autoTransform(UsePluginDefault), async(false), cache(true), - mirror(false) + mirror(false), + oldAutoTransform(false) { } @@ -75,9 +77,11 @@ public: QSize sourcesize; QSize oldSourceSize; qreal devicePixelRatio; + AutoTransform autoTransform; bool async : 1; bool cache : 1; bool mirror: 1; + bool oldAutoTransform : 1; }; QT_END_NAMESPACE |