diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:03:22 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:17:53 (GMT) |
| commit | 19095f432ef7ef424ea8dc89b19e43ed9f031b3e (patch) | |
| tree | 159654fbd2066eaea6d6fe78efc9726b5959eb3d /src/gui/egl/qegl_qws.cpp | |
| parent | 196e1484c22f6347061fa433987a86d90e178a55 (diff) | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
| download | Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.zip Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.gz Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
Diffstat (limited to 'src/gui/egl/qegl_qws.cpp')
| -rw-r--r-- | src/gui/egl/qegl_qws.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/egl/qegl_qws.cpp b/src/gui/egl/qegl_qws.cpp index e999e0b..2a61beb 100644 --- a/src/gui/egl/qegl_qws.cpp +++ b/src/gui/egl/qegl_qws.cpp @@ -64,12 +64,6 @@ EGLSurface QEglContext::createSurface(QPaintDevice *device, const QEglProperties return EGL_NO_SURFACE; } -EGLDisplay QEglContext::getDisplay(QPaintDevice *device) -{ - Q_UNUSED(device); - return eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY)); -} - static QScreen *screenForDevice(QPaintDevice *device) { QScreen *screen = qt_screen; |