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

Conflicts:
	doc/src/declarative/globalobject.qdoc

3 files changed, 14 insertions, 6 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 3c142a7..e31a1b5 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -236,7 +236,9 @@ QmlComponent::Status QmlComponent::status() const
 }
 
 /*!
-    Returns true if the component is in the Null state, false otherwise.
+    \property QmlComponent::isNull
+
+    Is true if the component is in the Null state, false otherwise.
 
     Equivalent to status() == QmlComponent::Null.
 */
@@ -246,7 +248,9 @@ bool QmlComponent::isNull() const
 }
 
 /*!
-    Returns true if the component is in the Ready state, false otherwise.
+    \property QmlComponent::isReady
+
+    Is true if the component is in the Ready state, false otherwise.
 
     Equivalent to status() == QmlComponent::Ready.
 */
@@ -256,7 +260,9 @@ bool QmlComponent::isReady() const
 }
 
 /*!
-    Returns true if the component is in the Error state, false otherwise.
+    \property QmlComponent::isError
+
+    Is true if the component is in the Error state, false otherwise.
 
     Equivalent to status() == QmlComponent::Error.
 */
@@ -266,7 +272,9 @@ bool QmlComponent::isError() const
 }
 
 /*!
-    Returns true if the component is in the Loading state, false otherwise.
+    \property QmlComponent::isLoading
+
+    Is true if the component is in the Loading state, false otherwise.
 
     Equivalent to status() == QmlComponent::Loading.
 */
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index 7a194e0..bbd6022 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -47,7 +47,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \fn void qmlInfo(const QString& message, const QObject *object)
+    \fn QmlInfo qmlInfo(const QObject *object)
 
     \brief Prints warnings messages that include the file and line number for QML types.
 
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 9a17c34..99d6743 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -220,7 +220,7 @@ int qmlRegisterExtendedType(const char *typeName)
         attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>();
     }
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0, 0,
+    return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0,
             &T::staticMetaObject, attached, attachedMo,
             QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
             QmlPrivate::StaticCastSelector<T,QObject>::cast(),