diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 22:32:42 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 22:32:42 (GMT) |
| commit | 1e2409cf6acaa8b390e65745821d21f2a8bb344d (patch) | |
| tree | 3962fbc0bf92e2826fe6ba488c16240e8d1cf2de /src/declarative/fx/qfxitem.h | |
| parent | 9d9cf497c1d21fe80b5bdd0db2a2fa145ebe9ab0 (diff) | |
| parent | f10791eb1c45b090f60a2c2ecca3cc5fd237278e (diff) | |
| download | Qt-1e2409cf6acaa8b390e65745821d21f2a8bb344d.zip Qt-1e2409cf6acaa8b390e65745821d21f2a8bb344d.tar.gz Qt-1e2409cf6acaa8b390e65745821d21f2a8bb344d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxitem.h')
| -rw-r--r-- | src/declarative/fx/qfxitem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 8ca1f9e..3c872e1 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -111,7 +111,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QSimpleCanvasItem, public QmlParserS Q_PROPERTY(QmlList<QmlState *>* states READ states DESIGNABLE false) Q_PROPERTY(QmlList<QmlTransition *>* transitions READ transitions DESIGNABLE false) Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged) - Q_PROPERTY(QString qml READ qml WRITE setQml NOTIFY qmlChanged) + Q_PROPERTY(QUrl qml READ qml WRITE setQml NOTIFY qmlChanged) Q_PROPERTY(QFxItem *qmlItem READ qmlItem NOTIFY qmlChanged) Q_PROPERTY(qreal x READ x WRITE setX NOTIFY leftChanged) Q_PROPERTY(qreal y READ y WRITE setY NOTIFY topChanged) @@ -171,8 +171,8 @@ public: void setState(const QString &); QFxItem *qmlItem() const; - QString qml() const; - void setQml(const QString &); + QUrl qml() const; + void setQml(const QUrl &); bool flipVertically() const; void setFlipVertically(bool); |