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, 2 insertions, 35 deletions

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;