summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlcomponent.cpp16
-rw-r--r--src/declarative/qml/qmlinfo.cpp2
2 files changed, 13 insertions, 5 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.