summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcomponent.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-17 02:35:53 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-17 02:35:53 (GMT)
commitf31522c3b01bb832d8ef3fa0eea7ec01f13424b2 (patch)
tree48ffd6929c78ad000b0cc157eae1476851854974 /src/declarative/qml/qmlcomponent.h
parent39b2302dbed5fe510d71c1bde3864a79c1a4c9d0 (diff)
parent31d01e174c3a3a1bba2ec9bf40cdc22d4053d8ec (diff)
downloadQt-f31522c3b01bb832d8ef3fa0eea7ec01f13424b2.zip
Qt-f31522c3b01bb832d8ef3fa0eea7ec01f13424b2.tar.gz
Qt-f31522c3b01bb832d8ef3fa0eea7ec01f13424b2.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcomponent.h')
-rw-r--r--src/declarative/qml/qmlcomponent.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 835bdc5..0abb58f 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -67,6 +67,9 @@ class Q_DECLARATIVE_EXPORT QmlComponent : public QObject
Q_PROPERTY(bool isReady READ isReady NOTIFY statusChanged)
Q_PROPERTY(bool isError READ isError NOTIFY statusChanged)
Q_PROPERTY(bool isLoading READ isLoading NOTIFY statusChanged)
+ Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+ Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+ Q_PROPERTY(QUrl url READ url CONSTANT)
public:
QmlComponent(QObject *parent = 0);