diff -r 41300fa6a67c -r 2f34d5167611 src/gui/egl/qegl_wince.cpp --- a/src/gui/egl/qegl_wince.cpp Tue Feb 02 00:43:10 2010 +0200 +++ b/src/gui/egl/qegl_wince.cpp Fri Apr 16 15:50:13 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -87,20 +87,15 @@ return surf; } -EGLDisplay QEglContext::getDisplay(QPaintDevice *device) +EGLNativeDisplayType QEglContext::nativeDisplay() { - EGLDisplay dpy = 0; HWND win = (static_cast(device))->winId(); HDC myDc = GetDC(win); if (!myDc) { - qWarning("QEglContext::defaultDisplay(): WinCE display is not open"); + qWarning("QEglContext::nativeDisplay(): WinCE display is not open"); + return EGL_DEFAULT_DISPLAY; } - dpy = eglGetDisplay(EGLNativeDisplayType(myDc)); - if (dpy == EGL_NO_DISPLAY) { - qWarning("QEglContext::defaultDisplay(): Falling back to EGL_DEFAULT_DISPLAY"); - dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); - } - return dpy; + return EGLNativeDisplayType(myDc); } // Set pixel format and other properties based on a paint device.