summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-17 11:36:15 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-17 14:10:26 (GMT)
commitbd8e35f2e0a572d7c98b9c72eacfdeda435b0980 (patch)
tree5a96499826961e88f4a9e5845929d2728a4d9620
parente8a80a4eac6d0c1802d6e06e51c7ad5427f00ac8 (diff)
downloadQt-bd8e35f2e0a572d7c98b9c72eacfdeda435b0980.zip
Qt-bd8e35f2e0a572d7c98b9c72eacfdeda435b0980.tar.gz
Qt-bd8e35f2e0a572d7c98b9c72eacfdeda435b0980.tar.bz2
Make QX11GLPixmapData::scroll() return a value
Reviewed-By: TrustMe
-rw-r--r--src/opengl/qpixmapdata_x11gl_egl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_x11gl_egl.cpp b/src/opengl/qpixmapdata_x11gl_egl.cpp
index d3af60f..3ab385a 100644
--- a/src/opengl/qpixmapdata_x11gl_egl.cpp
+++ b/src/opengl/qpixmapdata_x11gl_egl.cpp
@@ -231,13 +231,15 @@ bool QX11GLPixmapData::scroll(int dx, int dy, const QRect &rect)
eglWaitClient();
}
- QX11PixmapData::scroll(dx, dy, rect);
+ bool success = QX11PixmapData::scroll(dx, dy, rect);
XSync(X11->display, False);
if (ctx) {
ctx->makeCurrent();
eglWaitNative(EGL_CORE_NATIVE_ENGINE);
}
+
+ return success;
}
#if !defined(QT_OPENGL_ES_1)