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>

20 files changed, 3 insertions, 189 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;
 };
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12painternode_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12painternode_p.h
index 50ba0a55b4..7f4842b3a6 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12painternode_p.h
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12painternode_p.h
@@ -111,13 +111,8 @@ private:
     QSGGeometry m_geometry;
     QSGD3D12TextureMaterial m_material;
 
-#ifndef QT_NO_BITFIELDS
     uint m_dirtyGeometry : 1;
     uint m_dirtyContents : 1;
-#else
-    uint m_dirtyGeometry = 1;
-    uint m_dirtyContents = 1;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12publicnodes_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12publicnodes_p.h
index b457ec340d..6150083aaf 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12publicnodes_p.h
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12publicnodes_p.h
@@ -107,13 +107,8 @@ private:
     QRectF m_rect;
     QRectF m_sourceRect;
     TextureCoordinatesTransformMode m_texCoordMode;
-#ifndef QT_NO_BITFIELDS
     uint m_isAtlasTexture : 1;
     uint m_ownsTexture : 1;
-#else
-    uint m_isAtlasTexture = 1;
-    uint m_ownsTexture = 1;
-#endif
 };
 
 class QSGD3D12NinePatchNode : public QSGNinePatchNode
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop_p.h
index 8ba4cbda2a..46f62948f1 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop_p.h
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop_p.h
@@ -104,13 +104,8 @@ private:
     struct WindowData {
         QQuickWindow *window;
         QSGD3D12RenderThread *thread;
-#ifndef QT_NO_BITFIELDS
         uint updateDuringSync : 1;
         uint forceRenderPass : 1;
-#else
-        uint updateDuringSync = 1;
-        uint forceRenderPass = 1;
-#endif
     };
 
     void startOrStopAnimationTimer();
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop_p.h b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop_p.h
index 0708d7dde3..f35b689e00 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop_p.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop_p.h
@@ -76,13 +76,8 @@ public:
     QSGRenderContext *createRenderContext(QSGContext *) const override;
 
     struct WindowData {
-#ifndef QT_NO_BITFIELDS
         bool updatePending : 1;
         bool grabOnly : 1;
-#else
-        bool updatePending = 1;
-        bool grabOnly = 1;
-#endif
     };
 
     QHash<QQuickWindow *, WindowData> m_windows;
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index a1eefe3988..2c0320f7f1 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -801,11 +801,7 @@ struct TypeReference
         , errorWhenNotFound(false)
     {}
     Location location; // first use
-#ifndef QT_NO_BITFIELDS
     bool needsCreation : 1; // whether the type needs to be creatable or not
-#else
-    bool needsCreation = 1;
-#endif
     bool errorWhenNotFound: 1;
 };
 
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 382dd9b7e1..7f82a02ae0 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -267,7 +267,6 @@ struct PropertyAttributes
             uchar m_mask : 4;
         };
         struct {
-#ifndef QT_NO_BITFIELDS
             uchar m_type : 1;
             uchar m_writable : 1;
             uchar m_enumerable : 1;
@@ -276,16 +275,6 @@ struct PropertyAttributes
             uchar writable_set : 1;
             uchar enumerable_set : 1;
             uchar configurable_set : 1;
-#else
-            uchar m_type = 1;
-            uchar m_writable = 1;
-            uchar m_enumerable = 1;
-            uchar m_configurable = 1;
-            uchar type_set = 1;
-            uchar writable_set = 1;
-            uchar enumerable_set = 1;
-            uchar configurable_set = 1;
-#endif
         };
     };
 
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h
index 63d6b0a609..53933cd090 100644
--- a/src/qml/memory/qv4heap_p.h
+++ b/src/qml/memory/qv4heap_p.h
@@ -70,7 +70,6 @@ struct InternalClass;
 struct VTable
 {
     const VTable * const parent;
-#ifndef QT_NO_BITFIELDS
     uint inlinePropertyOffset : 16;
     uint nInlineProperties : 16;
     uint isExecutionContext : 1;
@@ -81,18 +80,6 @@ struct VTable
     uint isArrayData : 1;
     uint unused : 18;
     uint type : 8;
-#else
-    uint inlinePropertyOffset = 16;
-    uint nInlineProperties = 16;
-    uint isExecutionContext = 1;
-    uint isString = 1;
-    uint isObject = 1;
-    uint isFunctionObject = 1;
-    uint isErrorObject = 1;
-    uint isArrayData = 1;
-    uint unused = 18;
-    uint type = 8;
-#endif
     const char *className;
     void (*destroy)(Heap::Base *);
     void (*markObjects)(Heap::Base *, MarkStack *markStack);
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 5553fe6b80..51a191a41f 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -108,7 +108,6 @@ public:
         enum { BitsLeftInFlags = 10 };
         unsigned _otherBits       : BitsLeftInFlags; // align to 32 bits
 
-#ifndef QT_NO_BITFIELDS
         // Can apply to all properties, except IsFunction
         unsigned isConstant       : 1; // Has CONST flag
         unsigned isWritable       : 1; // Has WRITE function
@@ -134,33 +133,7 @@ public:
         // Internal QQmlPropertyCache flags
         unsigned notFullyResolved : 1; // True if the type data is to be lazily resolved
         unsigned overrideIndexIsProperty: 1;
-#else
-        unsigned isConstant       = 1; // Has CONST flag
-        unsigned isWritable       = 1; // Has WRITE function
-        unsigned isResettable     = 1; // Has RESET function
-        unsigned isAlias          = 1; // Is a QML alias to another property
-        unsigned isFinal          = 1; // Has FINAL flag
-        unsigned isOverridden     = 1; // Is overridden by a extension property
-        unsigned isDirect         = 1; // Exists on a C++ QMetaObject
 
-        unsigned type             = 4; // stores an entry of Types
-
-        // Apply only to IsFunctions
-        unsigned isVMEFunction    = 1; // Function was added by QML
-        unsigned hasArguments     = 1; // Function takes arguments
-        unsigned isSignal         = 1; // Function is a signal
-        unsigned isVMESignal      = 1; // Signal was added by QML
-        unsigned isV4Function     = 1; // Function takes QQmlV4Function* args
-        unsigned isSignalHandler  = 1; // Function is a signal handler
-        unsigned isOverload       = 1; // Function is an overload of another function
-        unsigned isCloned         = 1; // The function was marked as cloned
-        unsigned isConstructor    = 1; // The function was marked is a constructor
-
-        // Internal QQmlPropertyCache flags
-        unsigned notFullyResolved = 1; // True if the type data is to be lazily resolved
-        unsigned overrideIndexIsProperty = 1;
-
-#endif
         inline Flags();
         inline bool operator==(const Flags &other) const;
         inline void copyPropertyTypeFlags(Flags from);
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index e1a7ac7f06..713f707387 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -217,15 +217,9 @@ private:
     // List of QQmlDataBlob's that I am waiting for to complete.
     QList<QQmlDataBlob *> m_waitingFor;
 
-#ifndef QT_NO_BITFIELDS
     int m_redirectCount:30;
     bool m_inCallback:1;
     bool m_isDone:1;
-#else
-    int m_redirectCount = 30;
-    bool m_inCallback = 1;
-    bool m_isDone =1;
-#endif
 };
 
 class QQmlTypeLoaderThread;
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index c3591567b6..7492527401 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -109,17 +109,11 @@ public:
     QQuickLoaderIncubator *incubator;
     QV4::PersistentValue initialPropertyValues;
     QV4::PersistentValue qmlCallingContext;
-#ifndef QT_NO_BITFIELDS
     bool updatingSize: 1;
     bool active : 1;
     bool loadingFromSource : 1;
     bool asynchronous : 1;
-#else
-    bool updatingSize = 1;
-    bool active = 1;
-    bool loadingFromSource = 1;
-    bool asynchronous = 1;
-#endif
+
     void _q_sourceLoaded();
     void _q_updateSize(bool loaderGeometryChanged = true);
 };
diff --git a/src/quick/items/qquickopenglshadereffect_p.h b/src/quick/items/qquickopenglshadereffect_p.h
index a15d85bff3..0c2adadc62 100644
--- a/src/quick/items/qquickopenglshadereffect_p.h
+++ b/src/quick/items/qquickopenglshadereffect_p.h
@@ -178,7 +178,6 @@ private:
 
     QQuickOpenGLShaderEffectCommon m_common;
 
-#ifndef QT_NO_BITFIELDS
     uint m_blending : 1;
     uint m_dirtyUniforms : 1;
     uint m_dirtyUniformValues : 1;
@@ -191,20 +190,6 @@ private:
     uint m_supportsAtlasTextures : 1;
     uint m_vertNeedsUpdate : 1;
     uint m_fragNeedsUpdate : 1;
-#else
-    uint m_blending = 1;
-    uint m_dirtyUniforms = 1;
-    uint m_dirtyUniformValues = 1;
-    uint m_dirtyTextureProviders = 1;
-    uint m_dirtyProgram = 1;
-    uint m_dirtyParseLog = 1;
-    uint m_dirtyMesh = 1;
-    uint m_dirtyGeometry = 1;
-    uint m_customVertexShader = 1;
-    uint m_supportsAtlasTextures = 1;
-    uint m_vertNeedsUpdate = 1;
-    uint m_fragNeedsUpdate = 1;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 82c01e7f54..b5e3a2c1eb 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -260,7 +260,7 @@ public:
     QQuickCustomRenderStage *customRenderStage;
 
     QColor clearColor;
-#ifndef QT_NO_BITFIELDS
+
     uint clearBeforeRendering : 1;
 
     uint persistentGLContext : 1;
@@ -271,18 +271,6 @@ public:
 
     bool allowChildEventFiltering : 1;
     bool allowDoubleClick : 1;
-#else
-    uint clearBeforeRendering = 1;
-
-    uint persistentGLContext = 1;
-    uint persistentSceneGraph = 1;
-
-    uint lastWheelEventAccepted = 1;
-    bool componentCompleted = 1;
-
-    bool allowChildEventFiltering = 1;
-    bool allowDoubleClick = 1;
-#endif
 
     Qt::FocusReason lastFocusReason;
 
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
index 8987fb0940..c724d18298 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
@@ -87,13 +87,8 @@ public:
     QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; }
 
     struct WindowData {
-#ifndef QT_NO_BITFIELDS
         bool updatePending : 1;
         bool grabOnly : 1;
-#else
-        bool updatePending = 1;
-        bool grabOnly = 1;
-#endif
     };
 
     QHash<QQuickWindow *, WindowData> m_windows;
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 8362ff54dc..d4ff6ea9fe 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -123,15 +123,9 @@ private:
 
     const QSGBindable *m_bindable;
 
-#ifndef QT_NO_BITFIELDS
     uint m_changed_emitted : 1;
     uint m_is_rendering : 1;
     uint m_is_preprocessing : 1;
-#else
-    uint m_changed_emitted = 1;
-    uint m_is_rendering = 1;
-    uint m_is_preprocessing = 1;
-#endif
 };
 
 class Q_QUICK_PRIVATE_EXPORT QSGBindable
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 9e5cc27cd8..8130272295 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -161,13 +161,8 @@ public:
     QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; }
 
     struct WindowData {
-#ifndef QT_NO_BITFIELDS
         bool updatePending : 1;
         bool grabOnly : 1;
-#else
-        bool updatePending = 1;
-        bool grabOnly = 1;
-#endif
     };
 
     QHash<QQuickWindow *, WindowData> m_windows;
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
index 7568047fd2..32bfcb7148 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h
+++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
@@ -101,13 +101,8 @@ private:
         QQuickWindow *window;
         QSGRenderThread *thread;
         QSurfaceFormat actualWindowFormat;
-#ifndef QT_NO_BITFIELDS
         uint updateDuringSync : 1;
         uint forceRenderPass : 1;
-#else
-        uint updateDuringSync = 1;
-        uint forceRenderPass = 1;
-#endif
     };
 
     friend class QSGRenderThread;
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
index af265c0ec2..084fc1e004 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
@@ -155,7 +155,6 @@ private:
 #endif
     qreal m_contentsScale;
 
-#ifndef QT_NO_BITFIELDS
     bool m_dirtyContents : 1;
     bool m_opaquePainting : 1;
     bool m_linear_filtering : 1;
@@ -167,20 +166,6 @@ private:
     bool m_dirtyGeometry : 1;
     bool m_dirtyRenderTarget : 1;
     bool m_dirtyTexture : 1;
-#else
-    bool m_dirtyContents = 1;
-    bool m_opaquePainting = 1;
-    bool m_linear_filtering = 1;
-    bool m_mipmapping = 1;
-    bool m_smoothPainting = 1;
-    bool m_extensionsChecked = 1;
-    bool m_multisamplingSupported = 1;
-    bool m_fastFBOResizing = 1;
-    bool m_dirtyGeometry = 1;
-    bool m_dirtyRenderTarget = 1;
-    bool m_dirtyTexture = 1;
-#endif
-
 };
 
 QT_END_NAMESPACE