diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
| commit | b77269ff500e184237d523496e17639c94009ac8 (patch) | |
| tree | 43e51355eaa03f0185ef82826fa0436821674426 /src/compositor/compositor_api/qwaylandsurface.cpp | |
| parent | 12058b161e5f0d6f76523dc831acc8bdbc027fec (diff) | |
| parent | bacb3cdd83fd5c3112c5120130881ac3faa421fe (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 41a678128..2ebb04a35 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -269,12 +269,8 @@ void QWaylandSurfacePrivate::surface_commit(Resource *) emit q->damaged(damage); - if (oldBufferSize != bufferSize) { + if (oldBufferSize != bufferSize) emit q->bufferSizeChanged(); -#if QT_DEPRECATED_SINCE(5, 13) - emit q->sizeChanged(); -#endif - } if (oldBufferScale != bufferScale) emit q->bufferScaleChanged(); @@ -555,26 +551,6 @@ QSize QWaylandSurface::bufferSize() const return d->bufferSize; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - * \qmlproperty size QtWaylandCompositor::WaylandSurface::size - * \obsolete use bufferSize or destinationSize instead - * - * This property has been deprecated, use \l bufferSize or \l destinationSize instead. - */ - -/*! - * \property QWaylandSurface::size - * \obsolete use bufferSize or destinationSize instead - * - * This property has been deprecated, use \l bufferSize or \l destinationSize instead. - */ -QSize QWaylandSurface::size() const -{ - return bufferSize(); -} -#endif - /*! * \qmlproperty size QtWaylandCompositor::WaylandSurface::bufferScale * |