diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 00:28:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 08:28:27 +0200 |
| commit | ae745746a666134d9e9258b8c2ff00540624d835 (patch) | |
| tree | 8294fffa3d752d61f79004fb04e21e927472fd8f /src/quick/items/qquickitem_p.h | |
| parent | a7b383ab989e74ef552c2ef9c38377e065f1ab0e (diff) | |
| parent | 531d00c1909527cb1bc28f17197267ccde408b0c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsapi/qjsengine.cpp
src/qml/qml/qqmlengine_p.h
src/quick/items/qquickanchors.cpp
src/quick/items/qquickanimatedimage_p_p.h
src/quick/items/qquickitem_p.h
tests/auto/qml/qqmlecmascript/testtypes.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/benchmarks/qml/creation/tst_creation.cpp
Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index da1d430ac2..854cbd769b 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -402,7 +402,6 @@ public: quint32 flags:5; bool widthValid:1; bool heightValid:1; - bool baselineOffsetValid:1; bool componentComplete:1; bool keepMouse:1; bool keepTouch:1; @@ -411,8 +410,8 @@ public: bool antialiasing:1; bool focus:1; bool activeFocus:1; - // Bit 16 bool notifiedFocus:1; + // Bit 16 bool notifiedActiveFocus:1; bool filtersChildMouseEvents:1; bool explicitVisible:1; @@ -428,8 +427,8 @@ public: bool isAccessible:1; bool culled:1; bool hasCursor:1; - // Bit 32 bool hasCursorInChild:1; + // Bit 32 bool hasHoverInChild:1; bool activeFocusOnTab:1; bool implicitAntialiasing:1; |