diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-04 03:01:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-04 03:01:52 +0200 |
| commit | 27457f50b35b3941db4e7e5def742fcdefe218ff (patch) | |
| tree | 464f9688576f2d7f1f90c1caa1d1f710aec3ab3a | |
| parent | 4a38107bc12f8c3d9d290d4649c8606ea8b1376d (diff) | |
| parent | 42a466e0c77e4ef209a51bfa04ee6ca2bcae99a4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I75b7435eeb7d55e6d24b4951de9d402d70622866
| -rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 12e210f0d..7091628ba 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -102,7 +102,7 @@ Qt3DWindow::Qt3DWindow(QScreen *screen) resize(1024, 768); - QSurfaceFormat format; + QSurfaceFormat format = QSurfaceFormat::defaultFormat(); #ifdef QT_OPENGL_ES_2 format.setRenderableType(QSurfaceFormat::OpenGLES); #else diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 560247ae9..bc4bb25ee 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -116,7 +116,7 @@ Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) resize(1024, 768); - QSurfaceFormat format; + QSurfaceFormat format = QSurfaceFormat::defaultFormat(); #ifdef QT_OPENGL_ES_2 format.setRenderableType(QSurfaceFormat::OpenGLES); #else |