diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/particles/qquickparticlesystem_p.h | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickparticlesystem_p.h')
| -rw-r--r-- | src/quick/particles/qquickparticlesystem_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/particles/qquickparticlesystem_p.h b/src/quick/particles/qquickparticlesystem_p.h index 68b29b9bc0..387219f720 100644 --- a/src/quick/particles/qquickparticlesystem_p.h +++ b/src/quick/particles/qquickparticlesystem_p.h @@ -50,8 +50,8 @@ #include <QSignalMapper> #include <private/qquicksprite_p.h> #include <QAbstractAnimation> -#include <QtDeclarative/qdeclarative.h> -#include <private/qv8engine_p.h> //For QDeclarativeV8Handle +#include <QtQml/qqml.h> +#include <private/qv8engine_p.h> //For QQmlV8Handle QT_BEGIN_HEADER @@ -224,7 +224,7 @@ public: float lifeLeft(); float curSize(); void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index - QDeclarativeV8Handle v8Value(); + QQmlV8Handle v8Value(); void extendLife(float time); private: QQuickV8ParticleData* v8Datum; @@ -314,7 +314,7 @@ public: void registerParticleAffector(QQuickParticleAffector* a); void registerParticleGroup(QQuickParticleGroup* g); - static void statePropertyRedirect(QDeclarativeListProperty<QObject> *prop, QObject *value); + static void statePropertyRedirect(QQmlListProperty<QObject> *prop, QObject *value); static void stateRedirect(QQuickParticleGroup* group, QQuickParticleSystem* sys, QObject *value); bool isPaused() const { |