Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

1 files changed, 2 insertions, 15 deletions

diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index 38f0df857..93ec47835 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -49,6 +49,7 @@
 ****************************************************************************/
 
 #include <Qt3DQuickExtras/qt3dquickwindow.h>
+#include <Qt3DExtras/Qt3DWindow>
 #include "qt3dquickwindow_p.h"
 #include <Qt3DQuick/QQmlAspectEngine>
 #include <Qt3DQuickExtras/qt3dquickwindow.h>
@@ -114,24 +115,10 @@ Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent)
     : QWindow(*new Qt3DQuickWindowPrivate(), parent)
 {
     Q_D(Qt3DQuickWindow);
-    setSurfaceType(QSurface::OpenGLSurface);
 
     resize(1024, 768);
 
-    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
-#ifdef QT_OPENGL_ES_2
-    format.setRenderableType(QSurfaceFormat::OpenGLES);
-#else
-    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
-        format.setVersion(4, 3);
-        format.setProfile(QSurfaceFormat::CoreProfile);
-    }
-#endif
-    format.setDepthBufferSize(24);
-    format.setSamples(4);
-    format.setStencilBufferSize(8);
-    setFormat(format);
-    QSurfaceFormat::setDefaultFormat(format);
+    Qt3DExtras::setupWindowSurface(this, Qt3DRender::API::OpenGL);
 
     auto coreAspect = new Qt3DCore::QCoreAspect;
     d->m_renderAspect = new Qt3DRender::QRenderAspect;