diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 17:28:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 17:28:30 (GMT) |
| commit | 186f75db32bdc177bdbc192552cf7275d9723c85 (patch) | |
| tree | c34cddab358b7ad15582a274841f88c902226665 /src/gui/egl | |
| parent | 420fa181ed9f3947e257dc84f5cf3c8f7c94b9ba (diff) | |
| parent | 1a802007ca53aa0bd5fa5e474700660df6edf97b (diff) | |
| download | Qt-186f75db32bdc177bdbc192552cf7275d9723c85.zip Qt-186f75db32bdc177bdbc192552cf7275d9723c85.tar.gz Qt-186f75db32bdc177bdbc192552cf7275d9723c85.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:
Compile fix for Windows Mobile and OpenGLES2
Wrong dirty region after row selection in right-to-left mode in QTableView
Fixes: Mysql truncation of integer values + some autotest cleanup
Diffstat (limited to 'src/gui/egl')
| -rw-r--r-- | src/gui/egl/qegl_wince.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/egl/qegl_wince.cpp b/src/gui/egl/qegl_wince.cpp index dfef39f..87ec648 100644 --- a/src/gui/egl/qegl_wince.cpp +++ b/src/gui/egl/qegl_wince.cpp @@ -89,9 +89,7 @@ EGLSurface QEglContext::createSurface(QPaintDevice *device, const QEglProperties EGLNativeDisplayType QEglContext::nativeDisplay() { - //HWND win = (static_cast<QWidget*>(device))->winId(); - //HDC myDc = GetDC(win); - HDC myDc = GetWindowDC(0); + HDC myDc = GetDC(0); if (!myDc) { qWarning("QEglContext::nativeDisplay(): WinCE display is not open"); |