diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2023-07-03 18:19:22 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-31 20:08:51 +0000 |
| commit | 50f73c61b768cd66bdeb9cd98ca3af9868eecc1c (patch) | |
| tree | 9bf0b90c8c819cb29643935d31796abfbffa00a0 | |
| parent | 6b90d0a90f0796cfa7640f21f25e9ef779f9cfb0 (diff) | |
Move QQuickImageBase::sourceSize to QQuickImage
The sourceSize property in QQuickImageBase were shadowed by the
QQuickBorderImage class because of a change I made in
351979e05ad2a861fc3e6f8d1.
Since QQuickImageBase functions as the base class for QQuickBorderImage
and QQuickImage, and since sourceSize in those two classes work slighly
different (e.g QQuickBorderImage::sourceSize being read-only).
It would make more sense to simply let those two types declare their own
distinct Q_PROPERTIES, instead of using inheritance.
Fixes: QTBUG-116399
Change-Id: Ia238b58307b16031b56866450d74f10d1e59b62f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit c5f58f40eda72d6e7f28e24a7509ced3eca247d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/items/qquickimage_p.h | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickimagebase_p.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index a7644fb132..b6f8e369b7 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -30,6 +30,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImage : public QQuickImageBase Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged FINAL) Q_PROPERTY(HAlignment horizontalAlignment READ horizontalAlignment WRITE setHorizontalAlignment NOTIFY horizontalAlignmentChanged FINAL) Q_PROPERTY(VAlignment verticalAlignment READ verticalAlignment WRITE setVerticalAlignment NOTIFY verticalAlignmentChanged FINAL) + Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize RESET resetSourceSize NOTIFY sourceSizeChanged FINAL) Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged REVISION(2, 3) FINAL) Q_PROPERTY(bool autoTransform READ autoTransform WRITE setAutoTransform NOTIFY autoTransformChanged REVISION(2, 5) FINAL) Q_PROPERTY(QRectF sourceClipRect READ sourceClipRect WRITE setSourceClipRect RESET resetSourceClipRect NOTIFY sourceClipRectChanged REVISION(2, 15) FINAL) diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h index f8554274a7..673ca355ab 100644 --- a/src/quick/items/qquickimagebase_p.h +++ b/src/quick/items/qquickimagebase_p.h @@ -31,7 +31,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImageBase : public QQuickImplicitSizeItem Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged FINAL) Q_PROPERTY(bool cache READ cache WRITE setCache NOTIFY cacheChanged FINAL) - Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize RESET resetSourceSize NOTIFY sourceSizeChanged FINAL) Q_PROPERTY(bool mirror READ mirror WRITE setMirror NOTIFY mirrorChanged FINAL) Q_PROPERTY(bool mirrorVertically READ mirrorVertically WRITE setMirrorVertically NOTIFY mirrorVerticallyChanged REVISION(6, 2) FINAL) Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY currentFrameChanged REVISION(2, 14)) |