diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/includes/qqmlcomponent.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/doc/src/includes/qqmlcomponent.qdoc b/src/qml/doc/src/includes/qqmlcomponent.qdoc index 0eb60ed743..6949d8823a 100644 --- a/src/qml/doc/src/includes/qqmlcomponent.qdoc +++ b/src/qml/doc/src/includes/qqmlcomponent.qdoc @@ -52,7 +52,7 @@ Ensure that the URL provided is full and correct, in particular, use \l QUrl::fromLocalFile() when loading a file from the local filesystem. -Relative paths will be resolved against the engine's -\l {QQmlEngine::baseUrl}{baseUrl()}, which is the current working directory +Relative paths will be resolved against +\l {QQmlEngine::baseUrl}{QQmlEngine::baseUrl()}, which is the current working directory unless specified. //! [url-note] diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index f939ddbcf3..ede213b84a 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -349,7 +349,7 @@ */ /*! - \fn Object *qmlAttachedPropertiesObject(const QObject *attachee, bool create = true) + \fn template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *attachee, bool create = true) \relates QQmlEngine The form of this template function is: diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index 0b0132fab7..82b8d06dc4 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -370,7 +370,7 @@ void QQmlContext::setContextProperties(const QVector<PropertyPair> &properties) This struct contains a property name and a property value. It is used as a parameter for the \c setContextProperties function. - \sa QQQmlContext::setContextProperties() + \sa QQmlContext::setContextProperties() */ /*! diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index b0e6a24616..818ff7c34f 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -121,7 +121,9 @@ void QQmlExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri) \class QQmlExtensionInterface \internal \inmodule QtQml +*/ +/*! \class QQmlTypesExtensionInterface \internal \inmodule QtQml |