diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-13 12:39:49 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-13 12:39:49 (GMT) |
| commit | 6bee2674184d4c808cebb46e86b4faad6fc1e94e (patch) | |
| tree | 804f9e85e072238d1b8c93ccb816bcea61e5f601 /src | |
| parent | 49aa3d3a6bfd8befec2a00ff6166fe0e9fcf684d (diff) | |
| download | Qt-6bee2674184d4c808cebb46e86b4faad6fc1e94e.zip Qt-6bee2674184d4c808cebb46e86b4faad6fc1e94e.tar.gz Qt-6bee2674184d4c808cebb46e86b4faad6fc1e94e.tar.bz2 | |
Fixed compile for maemo6.
Explicit EGLNativeDisplayType casts are needed since maemo6 defines
EGL_DEFAULT_DISPLAY as ((void*)0).
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/egl/qegl.cpp | 2 | ||||
| -rw-r--r-- | src/gui/egl/qegl_x11.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index f66bd5a..4d447cb 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -359,7 +359,7 @@ EGLDisplay QEglContext::display() openedDisplay = true; if (dpy == EGL_NO_DISPLAY) { qWarning("QEglContext::display(): Falling back to EGL_DEFAULT_DISPLAY"); - dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); + dpy = eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY)); } if (dpy == EGL_NO_DISPLAY) { qWarning("QEglContext::display(): Can't even open the default display"); diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp index ef9ff78..634ff13 100644 --- a/src/gui/egl/qegl_x11.cpp +++ b/src/gui/egl/qegl_x11.cpp @@ -98,7 +98,7 @@ EGLNativeDisplayType QEglContext::nativeDisplay() Display *xdpy = QX11Info::display(); if (!xdpy) { qWarning("QEglContext::getDisplay(): X11 display is not open"); - return EGL_DEFAULT_DISPLAY; + return EGLNativeDisplayType(EGL_DEFAULT_DISPLAY); } return EGLNativeDisplayType(xdpy); } |