summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-04-23 11:56:39 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-04-23 11:56:39 (GMT)
commit7f4c36b07da085549bdc93c65e6b839a43877b0b (patch)
treeff1db28f816b4fdace0cf85e533f0d26d305c9c2
parent1f50b3a05b87c86997ed4f8cc4352ecb5320305e (diff)
parentae2f97f35a43719245d402a064d19acb2847547b (diff)
downloadQt-7f4c36b07da085549bdc93c65e6b839a43877b0b.zip
Qt-7f4c36b07da085549bdc93c65e6b839a43877b0b.tar.gz
Qt-7f4c36b07da085549bdc93c65e6b839a43877b0b.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/qml/qmlcomponent.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 91e0917..83d08ea 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -89,7 +89,7 @@ public:
void setData(const QByteArray &, const QUrl &baseUrl = QUrl());
Q_SIGNALS:
- void statusChanged(Status);
+ void statusChanged(QmlComponent::Status);
protected:
QmlComponent(QmlComponentPrivate &dd, QObject* parent);