summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-12 12:38:13 (GMT)
committerGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-12 12:38:13 (GMT)
commit0b623dd9c29de0958b7739215a621e134503cbb2 (patch)
treeca3d7c6ed4c8b590148c44f488f118e9b97d3cf0 /src
parentb781252fb857dbecd777554049de2143aa406b19 (diff)
parentf08dba7fbbc53f4dcc8cc431e69c74192141eeba (diff)
downloadQt-0b623dd9c29de0958b7739215a621e134503cbb2.zip
Qt-0b623dd9c29de0958b7739215a621e134503cbb2.tar.gz
Qt-0b623dd9c29de0958b7739215a621e134503cbb2.tar.bz2
Merge remote branch 'qt-master/master'
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl_x11egl.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 5755067..2ddfd35 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -105,10 +105,18 @@ QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *)
return;
}
+ XSetWindowAttributes attr;
+ unsigned long mask;
+ attr.background_pixel = 0;
+ attr.border_pixel = 0;
+ attr.colormap = XCreateColormap(X11->display, DefaultRootWindow(X11->display), vi->visual, AllocNone);
+ attr.event_mask = StructureNotifyMask | ExposureMask;
+ mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+
d->window = XCreateWindow(X11->display, RootWindow(X11->display, screen),
0, 0, 1, 1, 0,
vi->depth, InputOutput, vi->visual,
- 0, 0);
+ mask, &attr);
d->surface = eglCreateWindowSurface(d->display, config, (EGLNativeWindowType) d->window, NULL);