1 files changed, 17 insertions, 6 deletions
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index df7d11e405..13388c0841 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -48,13 +48,17 @@
 
 #include <QtQuick/private/qsgcontext_p.h>
 #include <QtQuick/private/qquickwindow_p.h>
+#include <QtQuick/private/qsgdefaultrendercontext_p.h>
 
 #include <QtQuick/QQuickWindow>
 
 #include <private/qquickprofiler_p.h>
-#include <private/qquickshadereffectnode_p.h>
 #include <private/qquickanimatorcontroller_p.h>
 
+#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#include <private/qquickopenglshadereffectnode_p.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
@@ -78,7 +82,7 @@ QSGWindowsRenderLoop::QSGWindowsRenderLoop()
     , m_updateTimer(0)
     , m_animationTimer(0)
 {
-    m_rc = m_sg->createRenderContext();
+    m_rc = static_cast<QSGDefaultRenderContext *>(m_sg->createRenderContext());
 
     m_animationDriver = m_sg->createAnimationDriver(m_sg);
     m_animationDriver->install();
@@ -241,7 +245,9 @@ void QSGWindowsRenderLoop::windowDestroyed(QQuickWindow *window)
     if (Q_UNLIKELY(!current))
         qCDebug(QSG_LOG_RENDERLOOP) << "cleanup without an OpenGL context";
 
-    QQuickShaderEffectMaterial::cleanupMaterialCache();
+#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+    QQuickOpenGLShaderEffectMaterial::cleanupMaterialCache();
+#endif
 
     d->cleanupNodesOnShutdown();
     if (m_windows.size() == 0) {
@@ -257,7 +263,7 @@ void QSGWindowsRenderLoop::windowDestroyed(QQuickWindow *window)
 
 bool QSGWindowsRenderLoop::anyoneShowing() const
 {
-    foreach (const WindowData &wd, m_windows)
+    for (const WindowData &wd : qAsConst(m_windows))
         if (wd.window->isVisible() && wd.window->isExposed() && wd.window->size().isValid())
             return true;
     return false;
@@ -341,6 +347,11 @@ void QSGWindowsRenderLoop::maybeUpdate(QQuickWindow *window)
     maybePostUpdateTimer();
 }
 
+QSGRenderContext *QSGWindowsRenderLoop::createRenderContext(QSGContext *) const
+{
+    return m_rc;
+}
+
 bool QSGWindowsRenderLoop::event(QEvent *event)
 {
     switch (event->type()) {
@@ -371,7 +382,7 @@ void QSGWindowsRenderLoop::render()
 {
     RLDEBUG("render");
     bool rendered = false;
-    foreach (const WindowData &wd, m_windows) {
+    for (const WindowData &wd : qAsConst(m_windows)) {
         if (wd.pendingUpdate) {
             const_cast<WindowData &>(wd).pendingUpdate = false;
             renderWindow(wd.window);
@@ -434,7 +445,7 @@ void QSGWindowsRenderLoop::renderWindow(QQuickWindow *window)
         }
     }
 
-    d->flushDelayedTouchEvent();
+    d->flushFrameSynchronousEvents();
     // Event delivery or processing has caused the window to stop rendering.
     if (!windowData(window))
         return;