Merge "Merge remote-tracking branch 'origin/wip/scenegraphng' into dev" into refs/staging/dev

3 files changed, 16 insertions, 4 deletions

diff --git a/src/quick/designer/qquickdesignersupport.cpp b/src/quick/designer/qquickdesignersupport.cpp
index 78ed89a107..f063cd3a81 100644
--- a/src/quick/designer/qquickdesignersupport.cpp
+++ b/src/quick/designer/qquickdesignersupport.cpp
@@ -92,6 +92,7 @@ void QQuickDesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool h
         texture->setRect(referencedItem->boundingRect());
         texture->setSize(referencedItem->boundingRect().size().toSize());
         texture->setRecursive(true);
+#ifndef QT_NO_OPENGL
 #ifndef QT_OPENGL_ES
         if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL)
             texture->setFormat(GL_RGBA8);
@@ -100,6 +101,7 @@ void QQuickDesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool h
 #else
         texture->setFormat(GL_RGBA);
 #endif
+#endif
         texture->setHasMipmaps(false);
 
         m_itemTextureHash.insert(referencedItem, texture);
diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp
index efa3bcb51a..2d37db08e7 100644
--- a/src/quick/designer/qquickdesignerwindowmanager.cpp
+++ b/src/quick/designer/qquickdesignerwindowmanager.cpp
@@ -39,8 +39,9 @@
 
 #include "qquickdesignerwindowmanager_p.h"
 #include "private/qquickwindow_p.h"
-#include <QtGui/QOpenGLContext>
-
+#ifndef QT_NO_OPENGL
+# include <QtQuick/private/qsgdefaultrendercontext_p.h>
+#endif
 #include <QtQuick/QQuickWindow>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +49,7 @@ QT_BEGIN_NAMESPACE
 QQuickDesignerWindowManager::QQuickDesignerWindowManager()
     : m_sgContext(QSGContext::createDefaultContext())
 {
-    m_renderContext.reset(new QSGRenderContext(m_sgContext.data()));
+    m_renderContext.reset(m_sgContext.data()->createRenderContext());
 }
 
 void QQuickDesignerWindowManager::show(QQuickWindow *window)
@@ -66,6 +67,7 @@ void QQuickDesignerWindowManager::windowDestroyed(QQuickWindow *)
 
 void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window)
 {
+#ifndef QT_NO_OPENGL
     if (!m_openGlContext) {
         m_openGlContext.reset(new QOpenGLContext());
         m_openGlContext->setFormat(window->requestedFormat());
@@ -76,6 +78,9 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window)
     } else {
         m_openGlContext->makeCurrent(window);
     }
+#else
+    Q_UNUSED(window)
+#endif
 }
 
 void QQuickDesignerWindowManager::exposureChanged(QQuickWindow *)
diff --git a/src/quick/designer/qquickdesignerwindowmanager_p.h b/src/quick/designer/qquickdesignerwindowmanager_p.h
index 8af54c117f..a50f8aa49f 100644
--- a/src/quick/designer/qquickdesignerwindowmanager_p.h
+++ b/src/quick/designer/qquickdesignerwindowmanager_p.h
@@ -57,6 +57,10 @@
 #include <private/qtquickglobal_p.h>
 #include <QtQuick/private/qsgcontext_p.h>
 
+#ifndef QT_NO_OPENGL
+# include <QtGui/QOpenGLContext>
+#endif
+
 
 QT_BEGIN_NAMESPACE
 
@@ -64,7 +68,6 @@ class QQuickWindow;
 class QSGContext;
 class QSGRenderContext;
 class QAnimationDriver;
-class QOpenGLContext;
 
 class QQuickDesignerWindowManager : public QSGRenderLoop
 {
@@ -94,7 +97,9 @@ public:
     static void createOpenGLContext(QQuickWindow *window);
 
 private:
+#ifndef QT_NO_OPENGL
     QScopedPointer<QOpenGLContext> m_openGlContext;
+#endif
     QScopedPointer<QSGContext> m_sgContext;
     QScopedPointer<QSGRenderContext> m_renderContext;
 };