diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-04-28 15:16:32 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-05-02 09:08:30 +0200 |
| commit | a9644b46cac8b17f62cfc032d8868916523b2663 (patch) | |
| tree | 16f1ef395832b8b8b3385416f875367fd0ff896a | |
| parent | e90b2040a264d2bc3439528187b0f9be0b38efd6 (diff) | |
Remove obsolete Q_ENUMS usage
In qgfxsourceproxy_p.h, we can use the modern Q_ENUM. In
QQuickStyleOption, he usage of Q_ENUMS did not make sense to begin with,
as the class is neither a QObject nor a Q_GADGET (nor a Q_NAMESPACE).
Change-Id: I5b85a46f57033442504a27bf2e1a05d7b0aaac48
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| -rw-r--r-- | src/effects/qgfxsourceproxy_p.h | 2 | ||||
| -rw-r--r-- | src/quicknativestyle/qstyle/qquickstyleoption.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/effects/qgfxsourceproxy_p.h b/src/effects/qgfxsourceproxy_p.h index ef22e17027..626c3ee8c3 100644 --- a/src/effects/qgfxsourceproxy_p.h +++ b/src/effects/qgfxsourceproxy_p.h @@ -31,7 +31,6 @@ class QGfxSourceProxy : public QQuickItem Q_PROPERTY(QRectF sourceRect READ sourceRect WRITE setSourceRect NOTIFY sourceRectChanged) Q_PROPERTY(bool active READ isActive NOTIFY activeChanged) Q_PROPERTY(Interpolation interpolation READ interpolation WRITE setInterpolation NOTIFY interpolationChanged) - Q_ENUMS(Interpolation) public: enum class Interpolation { @@ -39,6 +38,7 @@ public: Nearest, Linear }; + Q_ENUM(Interpolation) QGfxSourceProxy(QQuickItem *parentItem = nullptr); ~QGfxSourceProxy(); diff --git a/src/quicknativestyle/qstyle/qquickstyleoption.h b/src/quicknativestyle/qstyle/qquickstyleoption.h index 02b17dc121..a8b36cf0c3 100644 --- a/src/quicknativestyle/qstyle/qquickstyleoption.h +++ b/src/quicknativestyle/qstyle/qquickstyleoption.h @@ -35,7 +35,6 @@ public: SO_CustomBase = 0xf00, SO_ComplexCustomBase = 0xf000000 }; - Q_ENUMS(OptionType) enum StyleOptionType { Type = SO_Default }; enum StyleOptionVersion { Version = 1 }; |