7 files changed, 43 insertions, 3 deletions
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index 7492527401..c3591567b6 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -109,11 +109,17 @@ 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 0c2adadc62..a15d85bff3 100644
--- a/src/quick/items/qquickopenglshadereffect_p.h
+++ b/src/quick/items/qquickopenglshadereffect_p.h
@@ -178,6 +178,7 @@ private:
 
     QQuickOpenGLShaderEffectCommon m_common;
 
+#ifndef QT_NO_BITFIELDS
     uint m_blending : 1;
     uint m_dirtyUniforms : 1;
     uint m_dirtyUniformValues : 1;
@@ -190,6 +191,20 @@ 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/qquickview.cpp b/src/quick/items/qquickview.cpp
index 1ac6c768e8..17f6539974 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -102,7 +102,11 @@ void QQuickViewPrivate::execute()
     }
     if (!source.isEmpty()) {
         QML_MEMORY_SCOPE_URL(engine.data()->baseUrl().resolved(source));
+#ifdef Q_OS_HTML5
+        component = new QQmlComponent(engine.data(), source, QQmlComponent::PreferSynchronous, q);
+#else
         component = new QQmlComponent(engine.data(), source, q);
+#endif
         if (!component->isLoading()) {
             q->continueExecute();
         } else {
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index aefdaea2b7..26b97d452a 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -536,6 +536,8 @@ void QQuickWindowPrivate::init(QQuickWindow *c, QQuickRenderControl *control)
 
     Q_Q(QQuickWindow);
 
+    qRegisterMetaType<QWindow::Visibility>();
+
     contentItem = new QQuickRootItem;
     QQml_setParent_noEvent(contentItem, c);
     QQmlEngine::setObjectOwnership(contentItem, QQmlEngine::CppOwnership);
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index b5e3a2c1eb..82c01e7f54 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,6 +271,18 @@ 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/items/qquickwindowattached.cpp b/src/quick/items/qquickwindowattached.cpp
index 481366222d..37f0a812e7 100644
--- a/src/quick/items/qquickwindowattached.cpp
+++ b/src/quick/items/qquickwindowattached.cpp
@@ -116,7 +116,6 @@ void QQuickWindowAttached::windowChange(QQuickWindow *window)
 
         if (!window)
             return;
-
         // QQuickWindowQmlImpl::visibilityChanged also exists, and window might even
         // be QQuickWindowQmlImpl, but that's not what we are connecting to.
         // So this is actual window state rather than a buffered or as-requested one.
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index e7033e9b8d..4a6f315d58 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_METATYPE(QWindow::Visibility)
+
 class QQuickWindowQmlImplPrivate;
 
 class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public QQmlParserStatus