From 226fa7b8f7cea766f5746c29b2abafcfd16e34a5 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas@andreasbuhr.de>
Date: Wed, 2 Dec 2020 15:15:43 +0100
Subject: 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>
---
 src/qml/qml/qqmlinfo.cpp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'src/qml/qml')

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
 */
 
-- 
cgit v1.2.3