diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-25 15:34:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-31 04:34:27 +0000 |
| commit | 03fa9780fa1ac8bab10f99a59dd3fc2f8f878222 (patch) | |
| tree | 2b6be5b4b3b46e7afde0e63b753e39d3ee6067b2 /src/qml/qml | |
| parent | cee040d75c6285f73c12e37a724ff4e84b41b104 (diff) | |
Fix some qdoc warnings.
qtdeclarative/src/qml/qml/qqmlinfo.cpp:46: warning: Cannot find 'qmlInfo(...)' in '\fn' QQmlInfo qmlInfo(const QObject *object)
qtdeclarative/src/qml/qml/qqmlexpression.cpp:366: warning: Undocumented parameter 'column' in QQmlExpression::setSourceLocation()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: Undocumented parameter 'reason' in qmlRegisterExtendedUncreatableType()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: No such parameter 'message' in qmlRegisterExtendedUncreatableType()
Change-Id: Iec801b33b11bd57abadd968a90c49f8eba1280d5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/qml/qml')
| -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 |
3 files changed, 5 insertions, 5 deletions
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 |