diff options
| -rw-r--r-- | examples/qml/doc/src/qml-extending.qdoc | 2 | ||||
| -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 |
5 files changed, 5 insertions, 6 deletions
diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc index 77ccd2f1e9..e5b364e0bc 100644 --- a/examples/qml/doc/src/qml-extending.qdoc +++ b/examples/qml/doc/src/qml-extending.qdoc @@ -73,7 +73,7 @@ This example builds on: \li \l {Extending QML - Adding Types Example} \endlist -Shows how to use \l qmlRegisterExtendedType() to provide an \l {Registering +Shows how to use \l {QQmlEngine::}{qmlRegisterExtendedType()} to provide an \l {Registering Extension Objects}{extension object} to a \l QLineEdit without modifying or subclassing. The QML engine instantiates a \l QLineEdit and sets a property that only exists on the extension type. The extension type performs calls on the \l 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}. */ |