summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcontext.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-19 05:13:09 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-19 05:13:09 (GMT)
commit9a954d44aa20e0eb21bdf2820941bd7a1908096d (patch)
treecc001010d783596afd5203781dc2eac992b6b9b5 /src/declarative/qml/qmlcontext.cpp
parent9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d (diff)
downloadQt-9a954d44aa20e0eb21bdf2820941bd7a1908096d.zip
Qt-9a954d44aa20e0eb21bdf2820941bd7a1908096d.tar.gz
Qt-9a954d44aa20e0eb21bdf2820941bd7a1908096d.tar.bz2
Various doc fixes.
Make QML docs fit in with the new Qt style. Fix numerous qdoc errors.
Diffstat (limited to 'src/declarative/qml/qmlcontext.cpp')
-rw-r--r--src/declarative/qml/qmlcontext.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 365c0e8..61850c3 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -339,7 +339,7 @@ QmlContext *QmlContext::parentContext() const
}
/*!
- Add a default \a object to this context. The object will be added after
+ Add \a defaultObject to this context. The object will be added after
any existing default objects.
*/
void QmlContext::addDefaultObject(QObject *defaultObject)
@@ -417,7 +417,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
Resolves the URL \a src relative to the URL of the
containing component.
- \sa QmlEngine::componentUrl(), setBaseUrl()
+ \sa QmlEngine::baseUrl(), setBaseUrl()
*/
QUrl QmlContext::resolvedUrl(const QUrl &src)
{
@@ -441,13 +441,12 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
}
/*!
- Explicitly sets the url both resolveUri() and resolveUrl() will
- use for relative references to \a baseUrl.
+ Explicitly sets the url resolveUrl() will use for relative references to \a baseUrl.
Calling this function will override the url of the containing
component used by default.
- \sa resolvedUrl(), resolvedUri()
+ \sa resolvedUrl()
*/
void QmlContext::setBaseUrl(const QUrl &baseUrl)
{