diff options
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlfileselector.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmlinfo.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 4a6ed2fc84..5732be6b26 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -183,7 +183,7 @@ \a versionMinor. While the type has a name and a type, it cannot be created, and the - given error \a message will result if creation is attempted. + given error \a reason will result if creation is attempted. This is useful where the type is only intended for providing attached properties, enum values or an abstract base class with its extension. diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index bcdbf5b2df..18f882e1e0 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -364,7 +364,7 @@ int QQmlExpression::columnNumber() const } /*! - Set the location of this expression to \a line of \a url. This information + Set the location of this expression to \a line and \a column of \a url. This information is used by the script engine. */ void QQmlExpression::setSourceLocation(const QString &url, int line, int column) diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp index 2b3c2ade4f..3ee7bb3040 100644 --- a/src/qml/qml/qqmlfileselector.cpp +++ b/src/qml/qml/qqmlfileselector.cpp @@ -121,9 +121,9 @@ QQmlFileSelectorPrivate::QQmlFileSelectorPrivate() } /*! - Sets a different QFileSelector instance for use by the QQmlFileSelector. QQmlFileSelector does not - take ownership of the new QFileSelector. To reset QQmlFileSelector to use its internal - QFileSelector instance, call setSelector(0). + Sets the QFileSelector instance for use by the QQmlFileSelector to \a selector. + QQmlFileSelector does not take ownership of the new QFileSelector. To reset QQmlFileSelector + to use its internal QFileSelector instance, call setSelector(0). */ void QQmlFileSelector::setSelector(QFileSelector *selector) diff --git a/src/qml/qml/qqmlinfo.cpp b/src/qml/qml/qqmlinfo.cpp index 1608cb85ed..85979b8dc0 100644 --- a/src/qml/qml/qqmlinfo.cpp +++ b/src/qml/qml/qqmlinfo.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE /*! - \fn QQmlInfo qmlInfo(const QObject *object) + \fn QQmlInfo QtQml::qmlInfo(const QObject *object) \relates QQmlEngine Prints warning messages that include the file and line number for the |