diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-08-25 14:52:27 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-09-07 08:44:57 +0000 |
| commit | 919ef02b03b285b9dd576764d67a011a5969aab5 (patch) | |
| tree | 11db1b4c2f22adb7dcccfed6c086166ecbcdd84d /src/qml | |
| parent | 42f58e557034bb95005db465f078212cfc1b693a (diff) | |
Doc: Fixed several link errors
Change-Id: I684b8c0d238b7592b49abc0156bbc9791fdf6991
Task-number: QTBUG-43810
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmlitemselectionmodel.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/util/qqmlpropertymap.cpp | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 54ed3f1e6e..426848f6e6 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -314,7 +314,7 @@ merged with the original target class when used from within QML. For example: The \c leftMargin property is a new property added to an existing C++ type, \l QLineEdit, without modifying its source code. -The \l qmlRegisterExtendedType() function is for registering extended types. +The \l {QQmlEngine::}{qmlRegisterExtendedType()} function is for registering extended types. Note that it has two forms. \code diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 4910b6a1c6..402dbd321f 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -553,7 +553,7 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr) Creates a QJSValue with the given \a value. - \sa fromScriptValue(), newVariant() + \sa fromScriptValue() */ /*! \fn T QJSEngine::fromScriptValue(const QJSValue &value) diff --git a/src/qml/types/qqmlitemselectionmodel.qdoc b/src/qml/types/qqmlitemselectionmodel.qdoc index 185ffb5fa4..441d219de8 100644 --- a/src/qml/types/qqmlitemselectionmodel.qdoc +++ b/src/qml/types/qqmlitemselectionmodel.qdoc @@ -103,7 +103,7 @@ */ /*! - \qmlmethod QItemSelection selection() + \qmlmethod QItemSelection ItemSelectionModel::selection() */ /*! diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index 2e95ab7cb5..28f3c8f215 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -172,8 +172,7 @@ int QQmlPropertyMapMetaObject::createProperty(const char *name, const char *valu modify or clear its associated value. \note When deriving a class from QQmlPropertyMap, use the - \l {QQmlPropertyMap::QQmlPropertyMap(DerivedType *derived, QObject *parent)} - {protected two-argument constructor} + \l {QQmlPropertyMap::QQmlPropertyMap(DerivedType *derived, QObject *parent)} {protected two-argument constructor} which ensures that the class is correctly registered with the Qt \l {Meta-Object System}. */ |