diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-06-14 17:08:32 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2017-12-04 14:19:43 +0000 |
| commit | 42cf0bd5fa14075bf90e925010b36c83e03f7f87 (patch) | |
| tree | b009c70d30c9568cb393fe85bb582588dc20b5d0 /src/compositor/compositor_api/qwaylandquicksurface.cpp | |
| parent | 57c4af2b18c0fb1d266b245a107fa6cb876b9d9e (diff) | |
Remove QWaylandExtendedSurface* from the private compositor API
Removes QWaylandExtendedSurface, QWaylandSurfaceExtensionGlobal.
The only code touching these classes was
QWaylandQuickSurface::setClientRenderingEnabled(), but that code was only
useful if QWaylandSurfaceExtensionGlobal had already been instantiated.
The extension is a remnant from the past, and since no examples or tests are
using the extension, it's safe to remove it.
Change-Id: Ife202cb035c836b73a7c03985f5bf3be0abebc3d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquicksurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquicksurface.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp index ec68ee6a1..1197e9e43 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.cpp +++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp @@ -49,9 +49,6 @@ #include <QtWaylandCompositor/QWaylandView> #include <QtWaylandCompositor/private/qwaylandsurface_p.h> -#include <QtWaylandCompositor/private/qwayland-server-surface-extension.h> -#include <QtWaylandCompositor/private/qwlextendedsurface_p.h> - QT_BEGIN_NAMESPACE class QWaylandQuickSurfacePrivate : public QWaylandSurfacePrivate @@ -112,8 +109,11 @@ void QWaylandQuickSurface::setUseTextureAlpha(bool useTextureAlpha) /*! * \qmlproperty bool QtWaylandCompositor::WaylandSurface::clientRenderingEnabled + * \deprecated * - * This property specifies whether client rendering is enabled for the surface. + * This property used to specify whether client rendering was enabled for the surface. + * It depended on a Wayland extension that was part of the private API. The surface extension + * is not used anymore, so this property does nothing. */ bool QWaylandQuickSurface::clientRenderingEnabled() const { @@ -124,12 +124,9 @@ bool QWaylandQuickSurface::clientRenderingEnabled() const void QWaylandQuickSurface::setClientRenderingEnabled(bool enabled) { Q_D(QWaylandQuickSurface); + qWarning() << Q_FUNC_INFO << "doesn't do anything"; if (d->clientRenderingEnabled != enabled) { d->clientRenderingEnabled = enabled; - - if (QtWayland::ExtendedSurface *extSurface = QtWayland::ExtendedSurface::findIn(this)) - extSurface->setVisibility(enabled ? QWindow::AutomaticVisibility : QWindow::Hidden); - emit clientRenderingEnabledChanged(); } } |