diff options
| author | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-02 15:15:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-02 19:11:28 +0000 |
| commit | 226fa7b8f7cea766f5746c29b2abafcfd16e34a5 (patch) | |
| tree | d8f03ba669deba48bfec8a8d3454c41c1b84138f /src/qml/qml | |
| parent | 1a0434d9553879d18e5c28232613cd9c071bc99d (diff) | |
Fix documentation for qmlInfo, qmlDebug and qmlWarning
qmlInfo, qmlDebug, and qmlWarning are not in the QtQml namespace any
more. This patch adapts the documentation.
Task-number: QTBUG-88533
Change-Id: I7fafd3fc2769c5ffad515cacaacdc7ccbe07db46
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 815b347abe821664b2f8a4db53866826a639d6bc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlinfo.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/qml/qml/qqmlinfo.cpp b/src/qml/qml/qqmlinfo.cpp index 7a2521b7b8..ab55393406 100644 --- a/src/qml/qml/qqmlinfo.cpp +++ b/src/qml/qml/qqmlinfo.cpp @@ -51,13 +51,8 @@ QT_BEGIN_NAMESPACE /*! - \namespace QtQml - \inmodule QtQml - \brief Provides functions for producing logging messages for QML types. -*/ - -/*! - \fn QQmlInfo QtQml::qmlDebug(const QObject *object) + \fn QQmlInfo qmlDebug(const QObject *object) + \relates QQmlEngine \since 5.9 Prints debug messages that include the file and line number for the @@ -86,11 +81,12 @@ QT_BEGIN_NAMESPACE QML MyCustomType (unknown location): Internal state: 42 \endcode - \sa QtQml::qmlInfo, QtQml::qmlWarning + \sa qmlInfo, qmlWarning */ /*! - \fn QQmlInfo QtQml::qmlInfo(const QObject *object) + \fn QQmlInfo qmlInfo(const QObject *object) + \relates QQmlEngine Prints informational messages that include the file and line number for the specified QML \a object. @@ -113,11 +109,12 @@ QT_BEGIN_NAMESPACE QtMsgType. For Qt 5.9 and above, qmlInfo uses an info QtMsgType. To send warnings, use qmlWarning. - \sa QtQml::qmlDebug, QtQml::qmlWarning + \sa qmlDebug, qmlWarning */ /*! - \fn QQmlInfo QtQml::qmlWarning(const QObject *object) + \fn QQmlInfo qmlWarning(const QObject *object) + \relates QQmlEngine \since 5.9 Prints warning messages that include the file and line number for the @@ -137,36 +134,36 @@ QT_BEGIN_NAMESPACE QML MyCustomType (unknown location): property cannot be set to 0 \endcode - \sa QtQml::qmlDebug, QtQml::qmlInfo + \sa qmlDebug, qmlInfo */ /*! - \fn QQmlInfo QtQml::qmlDebug(const QObject *object, const QQmlError &error) + \fn QQmlInfo qmlDebug(const QObject *object, const QQmlError &error) \internal */ /*! - \fn QQmlInfo QtQml::qmlDebug(const QObject *object, const QList<QQmlError> &errors) + \fn QQmlInfo qmlDebug(const QObject *object, const QList<QQmlError> &errors) \internal */ /*! - \fn QQmlInfo QtQml::qmlInfo(const QObject *object, const QQmlError &error) + \fn QQmlInfo qmlInfo(const QObject *object, const QQmlError &error) \internal */ /*! - \fn QQmlInfo QtQml::qmlInfo(const QObject *object, const QList<QQmlError> &errors) + \fn QQmlInfo qmlInfo(const QObject *object, const QList<QQmlError> &errors) \internal */ /*! - \fn QQmlInfo QtQml::qmlWarning(const QObject *object, const QQmlError &error) + \fn QQmlInfo qmlWarning(const QObject *object, const QQmlError &error) \internal */ /*! - \fn QQmlInfo QtQml::qmlWarning(const QObject *object, const QList<QQmlError> &errors) + \fn QQmlInfo qmlWarning(const QObject *object, const QList<QQmlError> &errors) \internal */ |