summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-11 23:05:45 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-11 23:05:45 (GMT)
commit38c3d2d086d0e7fa07daf0d172d27747d6f95519 (patch)
tree24b0e1d7831476bf8f18858c8964e1bb1e697509 /src/declarative/qml/qmlengine.cpp
parent5e690831db11d5d84dc98589da01bf953f4fe06e (diff)
parent70cd26cfaf24455ceea6cb698a88be694728030c (diff)
downloadQt-38c3d2d086d0e7fa07daf0d172d27747d6f95519.zip
Qt-38c3d2d086d0e7fa07daf0d172d27747d6f95519.tar.gz
Qt-38c3d2d086d0e7fa07daf0d172d27747d6f95519.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
-rw-r--r--src/declarative/qml/qmlengine.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index fb4cedf..227aeb0 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -646,9 +646,7 @@ QNetworkAccessManager *QmlEngine::networkAccessManager() const
Returns the QmlContext for the \a object, or 0 if no context has been set.
When the QmlEngine instantiates a QObject, the context is set automatically.
-
- \sa qmlContext()
- */
+ */
QmlContext *QmlEngine::contextForObject(const QObject *object)
{
if(!object)