diff options
Diffstat (limited to 'src/quick/particles/qquickparticlegroup_p.h')
| -rw-r--r-- | src/quick/particles/qquickparticlegroup_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/particles/qquickparticlegroup_p.h b/src/quick/particles/qquickparticlegroup_p.h index f9703e8e03..8889187558 100644 --- a/src/quick/particles/qquickparticlegroup_p.h +++ b/src/quick/particles/qquickparticlegroup_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,11 +42,11 @@ #define QQuickPARTICLEGROUP #include <private/qquickspriteengine_p.h> #include "qquickparticlesystem_p.h" -#include "qdeclarativeparserstatus.h" +#include "qqmlparserstatus.h" QT_BEGIN_NAMESPACE -class QQuickParticleGroup : public QQuickStochasticState, public QDeclarativeParserStatus +class QQuickParticleGroup : public QQuickStochasticState, public QQmlParserStatus { Q_OBJECT //### Would setting limits per group be useful? Or clutter the API? @@ -55,14 +55,14 @@ class QQuickParticleGroup : public QQuickStochasticState, public QDeclarativePar Q_PROPERTY(QQuickParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged) //Intercept children requests and assign to the group & system - Q_PROPERTY(QDeclarativeListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states + Q_PROPERTY(QQmlListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states Q_CLASSINFO("DefaultProperty", "particleChildren") - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QQuickParticleGroup(QObject* parent = 0); - QDeclarativeListProperty<QObject> particleChildren(); + QQmlListProperty<QObject> particleChildren(); int maximumAlive() const { |