diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
| commit | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (patch) | |
| tree | 496a9d88c69b441e8c88aa0416b327faca3a1532 /src/quick/items/qquickitem_p.h | |
| parent | a2dad3ddee9c4bf274a7c6469342e4104605ceeb (diff) | |
| parent | 470ba767663e4ad9d3183fb56ee89361354dfefb (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickitem.cpp
src/quick/items/qquicktext.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 3987ff0cfb..ef5c63e40f 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -451,7 +451,7 @@ public: // dirtyToString() TransformUpdateMask = TransformOrigin | Transform | BasicTransform | Position | - Size | Window, + Window, ComplexTransformUpdateMask = Transform | Window, ContentUpdateMask = Size | Content | Smooth | Window | Antialiasing, ChildrenUpdateMask = ChildrenChanged | ChildrenStackingChanged | EffectReference | Window |