summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxparticles.h
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
commit9bcade632b72da7384d0b006c8d9db26d2f4baa1 (patch)
tree8fa48e5fa27db70268894989c8baa4f623383d70 /src/declarative/fx/qfxparticles.h
parentc01d432060dccca5bc22dc5fd86eae97e1df8231 (diff)
parent86aa54ba75101121a55d340620d2273b82e6143d (diff)
downloadQt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.zip
Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.gz
Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxparticles.h')
-rw-r--r--src/declarative/fx/qfxparticles.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h
index d9c810d..0696e60 100644
--- a/src/declarative/fx/qfxparticles.h
+++ b/src/declarative/fx/qfxparticles.h
@@ -153,7 +153,7 @@ class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem
{
Q_OBJECT
- Q_PROPERTY(QString src READ url WRITE setUrl);
+ Q_PROPERTY(QString source READ source WRITE setSource);
Q_PROPERTY(int count READ count WRITE setCount);
Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan);
Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation);
@@ -172,8 +172,8 @@ public:
QFxParticles(QFxItem *parent=0);
~QFxParticles();
- QString url() const;
- void setUrl(const QString &);
+ QString source() const;
+ void setSource(const QString &);
int count() const;
void setCount(int cnt);