Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 0f60870..83d500c 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -96,10 +96,10 @@ QML_DEFINE_TYPE(QmlComponent,Component);
     
     Specifies the loading status of the QmlComponent.
 
-    \o Null This QmlComponent has no data.  Call loadUrl() or setData() to add QML content.
-    \o Ready This QmlComponent is ready and create() may be called.
-    \o Loading This QmlComponent is loading network data.
-    \o Error An error has occured.  Calling errorDescription() to retrieve a description.
+    \value Null This QmlComponent has no data.  Call loadUrl() or setData() to add QML content.
+    \value Ready This QmlComponent is ready and create() may be called.
+    \value Loading This QmlComponent is loading network data.
+    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
 */
 
 void QmlComponentPrivate::typeDataReady()
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);