diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:46:56 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 11:29:29 +0000 |
commit | 6d199358d79f91508a38749b8b2cb71248b9a0b3 (patch) | |
tree | b447b941b9a81c608ff654ddadeb7eb56754cdad | |
parent | 02c8fa204f53af27907ef48bc74c500d7a05c3a0 (diff) |
wasm: revert no-bitfield change
This should be working now, we’ve already reverted
the similar change for qtdeclarative.
Change-Id: I5c77dfaebc7e5547fc3d769c2948764d72b1d94d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitem_p.h | 63 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscene_p.h | 23 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsview_p.h | 19 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.h | 9 |
4 files changed, 5 insertions, 109 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 31bef8a576..9fc6c0794a 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -460,7 +460,7 @@ public: #ifndef QT_NO_GESTURES QMap<Qt::GestureType, Qt::GestureFlags> gestureContext; #endif -#ifndef Q_OS_HTML5 + // Packed 32 bits quint32 acceptedMouseButtons : 5; quint32 visible : 1; @@ -516,63 +516,7 @@ public: quint32 sendParentChangeNotification : 1; quint32 dirtyChildrenBoundingRect : 1; quint32 padding : 19; -#else //HTML5 - // Packed 32 bits - quint32 acceptedMouseButtons = 5; - quint32 visible = 1; - quint32 explicitlyHidden = 1; - quint32 enabled = 1; - quint32 explicitlyDisabled = 1; - quint32 selected = 1; - quint32 acceptsHover = 1; - quint32 acceptDrops = 1; - quint32 isMemberOfGroup = 1; - quint32 handlesChildEvents = 1; - quint32 itemDiscovered = 1; - quint32 hasCursor = 1; - quint32 ancestorFlags = 5; - quint32 cacheMode = 2; - quint32 hasBoundingRegionGranularity = 1; - quint32 isWidget = 1; - quint32 dirty = 1; - quint32 dirtyChildren = 1; - quint32 localCollisionHack = 1; - quint32 inSetPosHelper = 1; - quint32 needSortChildren = 1; - quint32 allChildrenDirty = 1; - quint32 fullUpdatePending = 1; - - // Packed 32 bits - quint32 flags : 20; - quint32 paintedViewBoundingRectsNeedRepaint = 1; - quint32 dirtySceneTransform = 1; - quint32 geometryChanged = 1; - quint32 inDestructor = 1; - quint32 isObject = 1; - quint32 ignoreVisible = 1; - quint32 ignoreOpacity = 1; - quint32 acceptTouchEvents = 1; - quint32 acceptedTouchBeginEvent = 1; - quint32 filtersDescendantEvents = 1; - quint32 sceneTransformTranslateOnly = 1; - quint32 notifyBoundingRectChanged = 1; - // New 32 bits - quint32 notifyInvalidated = 1; - quint32 mouseSetsFocus = 1; - quint32 explicitActivate = 1; - quint32 wantsActive = 1; - quint32 holesInSiblingIndex = 1; - quint32 sequentialOrdering = 1; - quint32 updateDueToGraphicsEffect = 1; - quint32 scenePosDescendants = 1; - quint32 pendingPolish = 1; - quint32 mayHaveChildWithGraphicsEffect = 1; - quint32 isDeclarativeItem = 1; - quint32 sendParentChangeNotification = 1; - quint32 dirtyChildrenBoundingRect = 1; - quint32 padding = 19; -#endif // Optional stacking order int globalStackingOrder; QGraphicsItem *q_ptr; @@ -640,13 +584,8 @@ struct QGraphicsItemPaintInfo QStyleOptionGraphicsItem *option; QPainter *painter; qreal opacity; -#ifndef Q_OS_HTML5 quint32 wasDirtySceneTransform : 1; quint32 drawItem : 1; -#else - quint32 wasDirtySceneTransform =1; - quint32 drawItem=1; -#endif }; #if QT_CONFIG(graphicseffect) diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h index 44f0d3427f..2f5d7c54bb 100644 --- a/src/widgets/graphicsview/qgraphicsscene_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_p.h @@ -96,7 +96,7 @@ public: int lastItemCount; QRectF sceneRect; -#ifndef Q_OS_HTML5 + quint32 hasSceneRect : 1; quint32 dirtyGrowingItemsBoundingRect : 1; quint32 updateAll : 1; @@ -115,26 +115,7 @@ public: quint32 sortCacheEnabled : 1; // for compatibility quint32 allItemsIgnoreTouchEvents : 1; quint32 padding : 15; -#else - quint32 hasSceneRect = 1; - quint32 dirtyGrowingItemsBoundingRect = 1; - quint32 updateAll = 1; - quint32 calledEmitUpdated = 1; - quint32 processDirtyItemsEmitted = 1; - quint32 needSortTopLevelItems = 1; - quint32 holesInTopLevelSiblingIndex = 1; - quint32 topLevelSequentialOrdering = 1; - quint32 scenePosDescendantsUpdatePending = 1; - quint32 stickyFocus = 1; - quint32 hasFocus = 1; - quint32 lastMouseGrabberItemHasImplicitMouseGrab = 1; - quint32 allItemsIgnoreHoverEvents = 1; - quint32 allItemsUseDefaultCursor = 1; - quint32 painterStateProtection = 1; - quint32 sortCacheEnabled = 1; // for compatibility - quint32 allItemsIgnoreTouchEvents = 1; - quint32 padding = 15; -#endif + qreal minimumRenderSize; QRectF growingItemsBoundingRect; diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 6db16794fa..0428b9ce70 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -79,7 +79,6 @@ public: QGraphicsView::DragMode dragMode; -#ifndef Q_OS_HTML5 quint32 sceneInteractionAllowed : 1; quint32 hasSceneRect : 1; quint32 connectedToScene : 1; @@ -95,23 +94,7 @@ public: quint32 fullUpdatePending : 1; quint32 hasUpdateClip : 1; quint32 padding : 18; -#else - quint32 sceneInteractionAllowed = 1; - quint32 hasSceneRect = 1; - quint32 connectedToScene = 1; - quint32 useLastMouseEvent = 1; - quint32 identityMatrix = 1; - quint32 dirtyScroll = 1; - quint32 accelerateScrolling = 1; - quint32 keepLastCenterPoint = 1; - quint32 transforming = 1; - quint32 handScrolling = 1; - quint32 mustAllocateStyleOptions = 1; - quint32 mustResizeBackgroundPixmap = 1; - quint32 fullUpdatePending = 1; - quint32 hasUpdateClip = 1; - quint32 padding = 18; -#endif + QRectF sceneRect; void updateLastCenterPoint(); diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 282d7f033b..505a2a24c0 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -162,19 +162,12 @@ public: return false; return (attributes & (1 << bit)) != 0; } -#ifndef Q_OS_HTML5 quint32 attributes : 10; quint32 inSetGeometry : 1; quint32 polished: 1; quint32 inSetPos : 1; quint32 autoFillBackground : 1; -#else - quint32 attributes = 10; - quint32 inSetGeometry : 1; - quint32 polished= 1; - quint32 inSetPos = 1; - quint32 autoFillBackground : 1; -#endif + // Focus Qt::FocusPolicy focusPolicy; QGraphicsWidget *focusNext; |