diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 07:37:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 07:37:17 (GMT) |
| commit | 901bee3cbad3fcf52465d72cd257b4dd87e5b049 (patch) | |
| tree | 9456881308d5807fe7541fd3dac9f20069b2b9a6 /src/gui/egl | |
| parent | fb7204725ce88f175de6fa986296b42000e692c0 (diff) | |
| parent | 6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29 (diff) | |
| download | Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.zip Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.tar.gz Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Preparation to enable OpenGLES 2.0 for Windows Mobile.
Test modifications for the Windows Mobile platform.
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
Diffstat (limited to 'src/gui/egl')
| -rw-r--r-- | src/gui/egl/qegl_wince.cpp | 6 | ||||
| -rw-r--r-- | src/gui/egl/qeglproperties_p.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/egl/qegl_wince.cpp b/src/gui/egl/qegl_wince.cpp index c9c9773..dfef39f 100644 --- a/src/gui/egl/qegl_wince.cpp +++ b/src/gui/egl/qegl_wince.cpp @@ -89,8 +89,10 @@ EGLSurface QEglContext::createSurface(QPaintDevice *device, const QEglProperties EGLNativeDisplayType QEglContext::nativeDisplay() { - HWND win = (static_cast<QWidget*>(device))->winId(); - HDC myDc = GetDC(win); + //HWND win = (static_cast<QWidget*>(device))->winId(); + //HDC myDc = GetDC(win); + HDC myDc = GetWindowDC(0); + if (!myDc) { qWarning("QEglContext::nativeDisplay(): WinCE display is not open"); return EGL_DEFAULT_DISPLAY; diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h index feed1d2..43c3393 100644 --- a/src/gui/egl/qeglproperties_p.h +++ b/src/gui/egl/qeglproperties_p.h @@ -58,12 +58,17 @@ QT_BEGIN_INCLUDE_NAMESPACE +#if defined(QT_OPENGL_ES_2) +# include <GLES2/gl2.h> +#endif + #if defined(QT_GLES_EGL) -#include <GLES/egl.h> +# include <GLES/egl.h> #else -#include <EGL/egl.h> +# include <EGL/egl.h> #endif + #if defined(Q_WS_X11) // If <EGL/egl.h> included <X11/Xlib.h>, then the global namespace // may have been polluted with X #define's. The following makes sure |