From ba92fe922244a66b4851a049af61cf9be7b1bc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 24 Oct 2011 14:35:50 +0200 Subject: Re-added hellogl_es and ES 1 support for QOpenGLContext. Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7 Reviewed-by: Gunnar Sletta --- src/gui/kernel/qsurfaceformat.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gui/kernel/qsurfaceformat.cpp') diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 33b04cc708..b200cdb113 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -69,8 +69,8 @@ public: , swapBehavior(QSurfaceFormat::DefaultSwapBehavior) , numSamples(-1) , profile(QSurfaceFormat::NoProfile) - , major(1) - , minor(1) + , major(2) + , minor(0) { } @@ -399,6 +399,8 @@ void QSurfaceFormat::setMajorVersion(int major) /*! Returns the major OpenGL version. + + The default version is 2.0. */ int QSurfaceFormat::majorVersion() const { @@ -407,6 +409,8 @@ int QSurfaceFormat::majorVersion() const /*! Sets the desired minor OpenGL version. + + The default version is 2.0. */ void QSurfaceFormat::setMinorVersion(int minor) { -- cgit v1.2.3