diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 08:06:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 08:06:27 (GMT) |
| commit | f08dba7fbbc53f4dcc8cc431e69c74192141eeba (patch) | |
| tree | f514c4d52f6acc830aa176c3a8e5b9cdd238f79c /src | |
| parent | d2b05885a28aafa331b25cdf3b647b782605df08 (diff) | |
| parent | 404568a382d09e603013734533239e18d2bf8957 (diff) | |
| download | Qt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.zip Qt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.tar.gz Qt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Update XCreateWindow in qgl_X11egl.cpp
Lancelot: support for custom keys added to protocol. API cleanup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 10 |
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); |