diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 01:16:18 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 01:16:18 (GMT) |
commit | 9e17ec82f6915a636338c8be693773ec21db3a92 (patch) | |
tree | 46bde7e8b2b5b522b4710d895bf38a0d384f37e0 /src/opengl/qgl.cpp | |
parent | d67a5534cb50f66807b87526d42603c7d4df3595 (diff) | |
parent | ef704ebad66559170d761459d42d6c99996db529 (diff) | |
download | Qt-9e17ec82f6915a636338c8be693773ec21db3a92.zip Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.gz Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.bz2 |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index e9dbd6d..41677c4 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2118,7 +2118,7 @@ void QGLContextPrivate::syncGlState() #undef ctx #ifdef QT_NO_EGL -void QGLContextPrivate::swapRegion(const QRegion *) +void QGLContextPrivate::swapRegion(const QRegion &) { Q_Q(QGLContext); q->swapBuffers(); |