diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-24 14:35:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 12:37:51 +0100 |
| commit | ba92fe922244a66b4851a049af61cf9be7b1bc9d (patch) | |
| tree | 9fd717a158a23779eb443d012f7552c9bdc0890b /src/gui/kernel/qsurfaceformat.cpp | |
| parent | 73b682d816ec12afbf8064a44e462dd89e4c38df (diff) | |
Re-added hellogl_es and ES 1 support for QOpenGLContext.
Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/kernel/qsurfaceformat.cpp')
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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) { |