From 6bee2674184d4c808cebb46e86b4faad6fc1e94e Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Sat, 13 Feb 2010 22:39:49 +1000 Subject: Fixed compile for maemo6. Explicit EGLNativeDisplayType casts are needed since maemo6 defines EGL_DEFAULT_DISPLAY as ((void*)0). --- src/gui/egl/qegl.cpp | 2 +- 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); } -- cgit v0.12