[neon/qt6/qt6-base/Neon/release] debian/patches: revert_qdockwidget_api_break.diff

[Carlos De Maine]

Git commit f5355bb9216aa0e6b08a24f814a8ff407b8bc94a by Carlos De Maine.
Committed on 23/02/2024 at 22:57.
Pushed by carlosdem into branch 'Neon/release'.

revert_qdockwidget_api_break.diff

A  +62   -0    debian/patches/revert_qdockwidget api_break.diff
M  +3    -0    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/f5355bb9216aa0e6b08a24f814a8ff407b8bc94a

diff --git a/debian/patches/revert_qdockwidget api_break.diff b/debian/patches/revert_qdockwidget api_break.diff
new file mode 100644
index 0000000..2be518a
--- /dev/null
+++ b/debian/patches/revert_qdockwidget api_break.diff	
@@ -0,0 +1,62 @@
+From b148a362c36a9b34b0c21c60530353d6bf6b92cb Mon Sep 17 00:00:00 2001
+From: Axel Spoerl <axel.spoerl at qt.io>
+Date: Thu, 18 Jan 2024 10:05:23 +0000
+Subject: Revert "API Review / QDockWidget: Remove const/ref debug operator"
+
+This reverts commit ca2f46c04c26ed4649cb6c2c62d3b2e52cd8d5ad.
+
+Reason for revert: <BIC in 6.6 found by Marc Mutz>
+
+Pick-to: 6.7 6.6
+Change-Id: Ia5b8849e55ebccb514bc753ce1d31855d91e2406
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint at qt.io>
+---
+ 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 bf33ab2a4a..18a56e5a68 100644
+--- a/src/widgets/widgets/qdockwidget.cpp
++++ b/src/widgets/widgets/qdockwidget.cpp
+@@ -1826,16 +1826,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 82538ff1b6..5dfa41a4fc 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
+ 
+-- 
+cgit v1.2.3
diff --git a/debian/patches/series b/debian/patches/series
index cdfc766..ae16672 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# Neon added
+revert_qdockwidget api_break.diff
+
 # Needs to be fixed upstream.
 Add-SH-detection.patch