projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master <-> api_changes
[profile/ivi/qtdeclarative.git]
/
src
/
quick
/
particles
/
qquickparticlesystem_p.h
diff --git
a/src/quick/particles/qquickparticlesystem_p.h
b/src/quick/particles/qquickparticlesystem_p.h
index
68b29b9
..
f70cc5a
100644
(file)
--- a/
src/quick/particles/qquickparticlesystem_p.h
+++ b/
src/quick/particles/qquickparticlesystem_p.h
@@
-3,7
+3,7
@@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** 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
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@
-50,8
+50,8
@@
#include <QSignalMapper>
#include <private/qquicksprite_p.h>
#include <QAbstractAnimation>
#include <QSignalMapper>
#include <private/qquicksprite_p.h>
#include <QAbstractAnimation>
-#include <Qt
Declarative/qdeclarative
.h>
-#include <private/qv8engine_p.h> //For Q
Declarative
V8Handle
+#include <Qt
Qml/qqml
.h>
+#include <private/qv8engine_p.h> //For Q
Qml
V8Handle
QT_BEGIN_HEADER
QT_BEGIN_HEADER
@@
-224,7
+224,7
@@
public:
float lifeLeft();
float curSize();
void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index
float lifeLeft();
float curSize();
void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index
- Q
Declarative
V8Handle v8Value();
+ Q
Qml
V8Handle v8Value();
void extendLife(float time);
private:
QQuickV8ParticleData* v8Datum;
void extendLife(float time);
private:
QQuickV8ParticleData* v8Datum;
@@
-314,7
+314,7
@@
public:
void registerParticleAffector(QQuickParticleAffector* a);
void registerParticleGroup(QQuickParticleGroup* g);
void registerParticleAffector(QQuickParticleAffector* a);
void registerParticleGroup(QQuickParticleGroup* g);
- static void statePropertyRedirect(Q
Declarative
ListProperty<QObject> *prop, QObject *value);
+ static void statePropertyRedirect(Q
Qml
ListProperty<QObject> *prop, QObject *value);
static void stateRedirect(QQuickParticleGroup* group, QQuickParticleSystem* sys, QObject *value);
bool isPaused() const
{
static void stateRedirect(QQuickParticleGroup* group, QQuickParticleSystem* sys, QObject *value);
bool isPaused() const
{