fb92bb07.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273
  1. From fb92bb073e6e1dd327b9ee94bb1e5726e96396bf Mon Sep 17 00:00:00 2001
  2. From: Axel Spoerl <axel.spoerl@qt.io>
  3. Date: Thu, 25 Jan 2024 17:27:45 +0100
  4. Subject: API Review Widgets: Remove QDockWidget debug operators
  5. Adding specific debug operators for QDockWidget has introduced new
  6. symbols in 6.6.1. Remove them again, we maintain forward binary
  7. compatibility within a patch cycle.
  8. [ChangeLog][QtWidgets][QDockWidget] Removed debug streaming operator
  9. incorrectly introduced as a new symbol in Qt 6.6.1.
  10. Task-number: QTBUG-119952
  11. Pick-to: 6.6.2
  12. Change-Id: I1d5b96b442dc910d1782dbede6119708d8336991
  13. Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
  14. ---
  15. src/widgets/widgets/qdockwidget.cpp | 21 ---------------------
  16. src/widgets/widgets/qdockwidget.h | 5 -----
  17. 2 files changed, 26 deletions(-)
  18. diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
  19. index da8882d13c..7792bea118 100644
  20. --- a/src/widgets/widgets/qdockwidget.cpp
  21. +++ b/src/widgets/widgets/qdockwidget.cpp
  22. @@ -1836,27 +1836,6 @@ QWidget *QDockWidget::titleBarWidget() const
  23. return layout->widgetForRole(QDockWidgetLayout::TitleBar);
  24. }
  25. -#ifndef QT_NO_DEBUG_STREAM
  26. -QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget)
  27. -{
  28. - QDebugStateSaver saver(dbg);
  29. - dbg.nospace();
  30. - return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)";
  31. -}
  32. -
  33. -QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget)
  34. -{
  35. - QDebugStateSaver saver(dbg);
  36. - dbg.nospace();
  37. - dbg << "QDockWidget(" << static_cast<const void *>(&dockWidget);
  38. - dbg << "->(ObjectName=" << dockWidget.objectName();
  39. - dbg << "; floating=" << dockWidget.isFloating();
  40. - dbg << "; features=" << dockWidget.features();
  41. - dbg << ";))";
  42. - return dbg;
  43. -}
  44. -#endif // QT_NO_DEBUG_STREAM
  45. -
  46. QT_END_NAMESPACE
  47. #include "qdockwidget.moc"
  48. diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
  49. index 211b703e03..92b7663acd 100644
  50. --- a/src/widgets/widgets/qdockwidget.h
  51. +++ b/src/widgets/widgets/qdockwidget.h
  52. @@ -64,11 +64,6 @@ public:
  53. inline bool isAreaAllowed(Qt::DockWidgetArea area) const
  54. { return (allowedAreas() & area) == area; }
  55. -#ifndef QT_NO_DEBUG_STREAM
  56. - friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget);
  57. - friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget);
  58. -#endif
  59. -
  60. #ifndef QT_NO_ACTION
  61. QAction *toggleViewAction() const;
  62. #endif
  63. --
  64. cgit v1.2.3