diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 08:40:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 08:40:28 (GMT) |
| commit | 69d43435f241f0d654b1a3eecdfdfc5140f6beac (patch) | |
| tree | b552389385cd5b3c627280ee1488bab81939106d /src/opengl/qgl.cpp | |
| parent | cf28f6cacf59d434072656af05466541ba69e8ae (diff) | |
| parent | 1a72dd3a1c8f66e31ce4102b2d3e7e5cff4817f8 (diff) | |
| download | Qt-69d43435f241f0d654b1a3eecdfdfc5140f6beac.zip Qt-69d43435f241f0d654b1a3eecdfdfc5140f6beac.tar.gz Qt-69d43435f241f0d654b1a3eecdfdfc5140f6beac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make tst_image a little bit more tollerent to rounding errors
Clear the QGLWindowSurface in ::beginPaint when needed.
Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.
Fix QStaticText with OpenGL1 engine
tst_qimage: backport fix of commit 0d7e683 into 4.7
qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 943a195..c49dba4 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2103,11 +2103,8 @@ void QGLContextPrivate::syncGlState() #ifdef QT_NO_EGL void QGLContextPrivate::swapRegion(const QRegion *) { - static bool firstWarning = true; - if (firstWarning) { - qWarning() << "::swapRegion called but not supported!"; - firstWarning = false; - } + Q_Q(QGLContext); + q->swapBuffers(); } #endif |