aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickfriction_p.h
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2024-02-12 12:41:41 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-04 08:06:48 +0000
commitb6d36d89f671ab86df2a104b54d674490f62d4be (patch)
tree9ae5327483efae66629b7716fb3b852c418e35a5 /src/particles/qquickfriction_p.h
parent59e9c863f040f5da5361a9e866b0287aa7636214 (diff)
Mostly revert "Make properties in the particles module FINAL"
Making properties FINAL is an API break not covered by any QUIP rule. However, this does not apply to the attached type whose properties were marked FINAL in the referenced commit, as it is not possible to derive from it anyway. This reverts the majority of commit cb82b9f2addf25db34970ebb48f69291901ad7ba. Change-Id: Ib001417f0b4236f1c8e068ec5f238a4b9731f8cc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 31a60b518bd7d811172b887501e831e6e4e4a9c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9b28ff7304bbd0a2e30f2ccec1cd20ddc2f1c451)
Diffstat (limited to 'src/particles/qquickfriction_p.h')
-rw-r--r--src/particles/qquickfriction_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h
index 6e8aa5767a..3f0abffe68 100644
--- a/src/particles/qquickfriction_p.h
+++ b/src/particles/qquickfriction_p.h
@@ -21,8 +21,8 @@ QT_BEGIN_NAMESPACE
class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickFrictionAffector : public QQuickParticleAffector
{
Q_OBJECT
- Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged FINAL)
- Q_PROPERTY(qreal threshold READ threshold WRITE setThreshold NOTIFY thresholdChanged FINAL)
+ Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
+ Q_PROPERTY(qreal threshold READ threshold WRITE setThreshold NOTIFY thresholdChanged)
QML_NAMED_ELEMENT(Friction)
QML_ADDED_IN_VERSION(2, 0)
public: