From 7db3277cd7b5a52053cabe97bb5abbe152abf1ed Mon Sep 17 00:00:00 2001
From: Axel Spoerl <axel.spoerl@qt.io>
Date: Thu, 18 Jan 2024 10:05:23 +0000
Subject: [PATCH] Revert "API Review / QDockWidget: Remove const/ref debug
 operator"

This reverts commit ca2f46c04c26ed4649cb6c2c62d3b2e52cd8d5ad.

Reason for revert: <BIC in 6.6 found by Marc Mutz>

Change-Id: Ia5b8849e55ebccb514bc753ce1d31855d91e2406
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit b148a362c36a9b34b0c21c60530353d6bf6b92cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit be4f933c0ae30389869d74277982bd14a99fe11a)
---
 src/widgets/widgets/qdockwidget.cpp | 19 ++++++++++---------
 src/widgets/widgets/qdockwidget.h   |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 87470d178f1..da8882d13c8 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1841,16 +1841,17 @@ QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace();
+    return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)";
+}
 
-    if (!dockWidget) {
-        dbg << "QDockWidget(0x0)";
-        return dbg;
-    }
-
-    dbg << "QDockWidget(" << static_cast<const void *>(dockWidget);
-    dbg << "->(ObjectName=" << dockWidget->objectName();
-    dbg << "; floating=" << dockWidget->isFloating();
-    dbg << "; features=" << dockWidget->features();
+QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QDockWidget(" << static_cast<const void *>(&dockWidget);
+    dbg << "->(ObjectName=" << dockWidget.objectName();
+    dbg << "; floating=" << dockWidget.isFloating();
+    dbg << "; features=" << dockWidget.features();
     dbg << ";))";
     return dbg;
 }
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
index d561b72c107..211b703e034 100644
--- a/src/widgets/widgets/qdockwidget.h
+++ b/src/widgets/widgets/qdockwidget.h
@@ -65,6 +65,7 @@ public:
     { return (allowedAreas() & area) == area; }
 
 #ifndef QT_NO_DEBUG_STREAM
+    friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget);
     friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget);
 #endif