webassembly: revert the bitfield patch

The bitfield changes are no longer needed, as the problem with
variables becoming unchangable seems to have been fixed, or has cleared
itself up.

Change-Id: Ia681b7410922473ab26ff57894582f8386380a86
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

3 files changed, 1 insertions, 37 deletions

diff --git a/src/imports/layouts/qquickgridlayoutengine_p.h b/src/imports/layouts/qquickgridlayoutengine_p.h
index 0596cf4b80..2810e2e5d0 100644
--- a/src/imports/layouts/qquickgridlayoutengine_p.h
+++ b/src/imports/layouts/qquickgridlayoutengine_p.h
@@ -126,13 +126,8 @@ public:
     QQuickItem *m_item;
 private:
     mutable QSizeF cachedSizeHints[Qt::NSizeHints];
-#ifndef QT_NO_BITFIELDS
     mutable unsigned sizeHintCacheDirty : 1;
     mutable unsigned useFallbackToWidthOrHeight : 1;
-#else
-    mutable unsigned sizeHintCacheDirty  = 1;
-    mutable unsigned useFallbackToWidthOrHeight = 1;
-#endif
 };
 
 class QQuickGridLayoutEngine : public QGridLayoutEngine {
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index 87a5e5b08d..b31bffa290 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -134,16 +134,9 @@ public:
     QQuickLayoutPrivate() : m_isReady(false), m_disableRearrange(true) {}
 
 protected:
-#ifndef QT_NO_BITFIELDS
     unsigned m_isReady : 1;
     unsigned m_disableRearrange : 1;
     unsigned m_hasItemChangeListeners : 1;      // if false, we don't need to remove its item change listeners...
-#else
-    unsigned m_isReady =1 ;
-    unsigned m_disableRearrange = 1;
-    unsigned m_hasItemChangeListeners = 1;
-
-#endif
     mutable QSet<QQuickItem *> m_ignoredItems;
 };
 
@@ -311,7 +304,6 @@ private:
     int m_rowSpan;
     int m_columnSpan;
 
-#ifndef QT_NO_BITFIELDS
     unsigned m_fillWidth : 1;
     unsigned m_fillHeight : 1;
     unsigned m_isFillWidthSet : 1;
@@ -327,23 +319,6 @@ private:
     unsigned m_isTopMarginSet : 1;
     unsigned m_isRightMarginSet : 1;
     unsigned m_isBottomMarginSet : 1;
-#else
-    unsigned m_fillWidth = 1;
-    unsigned m_fillHeight = 1;
-    unsigned m_isFillWidthSet = 1;
-    unsigned m_isFillHeightSet = 1;
-    unsigned m_isMinimumWidthSet = 1;
-    unsigned m_isMinimumHeightSet = 1;
-    // preferredWidth and preferredHeight are always explicit, since
-    // their implicit equivalent is implicitWidth and implicitHeight
-    unsigned m_isMaximumWidthSet = 1;
-    unsigned m_isMaximumHeightSet = 1;
-    unsigned m_changesNotificationEnabled = 1;
-    unsigned m_isLeftMarginSet = 1;
-    unsigned m_isTopMarginSet = 1;
-    unsigned m_isRightMarginSet = 1;
-    unsigned m_isBottomMarginSet = 1;
-#endif
     Qt::Alignment m_alignment;
     friend class QQuickLayout;
 };
diff --git a/src/imports/layouts/qquicklinearlayout_p.h b/src/imports/layouts/qquicklinearlayout_p.h
index 956671855e..6706ebf9fa 100644
--- a/src/imports/layouts/qquicklinearlayout_p.h
+++ b/src/imports/layouts/qquicklinearlayout_p.h
@@ -117,16 +117,10 @@ public:
 
     QQuickGridLayoutEngine engine;
     Qt::Orientation orientation;
-#ifndef QT_NO_BITFIELDS
     unsigned m_rearranging : 1;
     unsigned m_updateAfterRearrange : 1;
-    Qt::LayoutDirection m_layoutDirection : 2;
-#else
-    unsigned m_rearranging = 1;
-    unsigned m_updateAfterRearrange = 1;
-    Qt::LayoutDirection m_layoutDirection;
-#endif
     QVector<QQuickItem *> m_invalidateAfterRearrange;
+    Qt::LayoutDirection m_layoutDirection : 2;
 
     QQuickLayoutStyleInfo *styleInfo;
 };