From 78e2a49a4832e2af7b9ff822b83edfcc66c8f369 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Fri, 2 Feb 2024 13:31:31 +0100
Subject: [PATCH] Reapply: Remove const/ref debug operator for QDockWidget

QObjects are usually passed by pointer, so we leave the override
taking a pointer.

This amends bbeff2a3350dd3396400865525d509b784c2d93e, and reverts
the previous revert in b148a362c36a9b34b0c21c60530353d6bf6b92cb.
Now that we have removed the incorrectly added operators from the
6.6 branches entirely, we can remove the unnecessary const/ref
operator from 6.7.

Task-number: QTBUG-119952
Change-Id: Id196367ddf3ffb443db44194002f850dcfec5d79
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 4b64df56509dd770002ec083ee64f3ec23a8b682)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/widgets/widgets/qdockwidget.cpp | 19 +++++++++----------
 src/widgets/widgets/qdockwidget.h   |  1 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 18a56e5a685..bf33ab2a4a2 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1826,17 +1826,16 @@ QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace();
-    return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)";
-}
 
-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();
+    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();
     dbg << ";))";
     return dbg;
 }
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
index 5dfa41a4fcf..82538ff1b67 100644
--- a/src/widgets/widgets/qdockwidget.h
+++ b/src/widgets/widgets/qdockwidget.h
@@ -65,7 +65,6 @@ 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