From 1bedf1aead29cd3030969e855958185990def071 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 13 May 2015 09:59:40 +0200 Subject: Port from Q_ENUMS to new macro Q_ENUM. Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration as meta enum and a debug stream operator. QQuickXmlListModel::Status is left unmodified as porting it creates a link error in tst_qquickxmllistmodel. Change-Id: Id5e6192c9f85e7c94332508fbd91873ddda31e1a Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/particles/qquickparticleemitter_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/particles/qquickparticleemitter_p.h') diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index 65e2a34aa7..68f01e3f6a 100644 --- a/src/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h @@ -67,7 +67,6 @@ class QQuickParticleEmitter : public QQuickItem Q_PROPERTY(QQuickDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged) Q_PROPERTY(qreal velocityFromMovement READ velocityFromMovement WRITE setVelocityFromMovement NOTIFY velocityFromMovementChanged) - Q_ENUMS(Lifetime) public: explicit QQuickParticleEmitter(QQuickItem *parent = 0); virtual ~QQuickParticleEmitter(); @@ -76,6 +75,7 @@ public: enum Lifetime { InfiniteLife = QQuickParticleSystem::maxLife }; + Q_ENUM(Lifetime) bool enabled() const { -- cgit v1.2.3