diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-06-17 18:53:47 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-06-17 18:53:47 -0700 |
| commit | 17576445b869845986ed7fa71cb96a307d122653 (patch) | |
| tree | 34dbd2a8dc48da2e755e829438f85e4ac9982027 | |
| parent | c92a812a65c15063fe58b4c93556427dbc955989 (diff) | |
Don't use nativePixmap or nativeWindow on Wayland
They don't really exist, so don't bother.
| -rw-r--r-- | src/gui/egl/qegl_p.h | 2 | ||||
| -rw-r--r-- | src/gui/egl/qegl_wayland.cpp | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index c1d54c739d..51570d27ba 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -236,8 +236,10 @@ namespace QEgl { Q_GUI_EXPORT EGLDisplay display(); Q_GUI_EXPORT EGLNativeDisplayType nativeDisplay(); +#ifndef Q_WS_WAYLAND Q_GUI_EXPORT EGLNativeWindowType nativeWindow(QWidget*); Q_GUI_EXPORT EGLNativePixmapType nativePixmap(QPixmap*); +#endif // Extension functions Q_GUI_EXPORT EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); diff --git a/src/gui/egl/qegl_wayland.cpp b/src/gui/egl/qegl_wayland.cpp index ff0b830327..03385d3271 100644 --- a/src/gui/egl/qegl_wayland.cpp +++ b/src/gui/egl/qegl_wayland.cpp @@ -162,18 +162,6 @@ EGLNativeDisplayType QEgl::nativeDisplay() return EGLNativeDisplayType(EGL_DEFAULT_DISPLAY); } -EGLNativeWindowType QEgl::nativeWindow(QWidget* widget) -{ - qFatal("%s should not be called\n", __func__); - return (EGLNativeWindowType)(widget->winId()); -} - -EGLNativePixmapType QEgl::nativePixmap(QPixmap*) -{ - qFatal("%s should not be called\n", __func__); - return (EGLNativePixmapType)0; -} - EGLImageKHR QEgl::createImage(QPaintDevice *device, EGLConfig cfg, const QEglProperties *properties) { |