diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-07 12:21:55 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 07:54:31 (GMT) |
| commit | 5ef1abb3b20bcdd1916016359d85c7277646c87f (patch) | |
| tree | 58a7f6fc21866c2f66121cffa46b23079cf39543 /src | |
| parent | 58ec5c8fe2e6c9f69402df8aeac2ca30029e77de (diff) | |
| download | Qt-5ef1abb3b20bcdd1916016359d85c7277646c87f.zip Qt-5ef1abb3b20bcdd1916016359d85c7277646c87f.tar.gz Qt-5ef1abb3b20bcdd1916016359d85c7277646c87f.tar.bz2 | |
qdoc: Fixed a few links to QtObject (QML:QtObject)
(cherry picked from commit 896de79554060aadf4963d8285ef3f5d8740428b)
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index c7fa3b3..f6973bc 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -125,7 +125,7 @@ QT_BEGIN_NAMESPACE QObject. See the QObject documentation for further details. */ /*! - \qmlproperty string QtObject::objectName + \qmlproperty string QML:QtObject::objectName This property allows you to give a name to this specific object instance. See \l{scripting.html#accessing-child-qobjects}{Accessing Child QObjects} @@ -236,8 +236,8 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) } /*! -\qmlmethod url Qt::resolvedUrl(url) -Returns \c url resolved relative to the URL of the caller. + \qmlmethod url Qt::resolvedUrl(url) + Returns \c url resolved relative to the URL of the caller. */ QUrl QDeclarativeScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url) { |