1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API Review Widgets: Remove QDockWidget debug operators

Browse Source 
Adding specific debug operators for QDockWidget has introduced new
symbols in 6.6.1. Remove them again, we maintain forward binary
compatibility within a patch cycle.

[ChangeLog][QtWidgets][QDockWidget] Removed debug streaming operator
incorrectly introduced as a new symbol in Qt 6.6.1.

Task-number: QTBUG-119952
Change-Id: I1d5b96b442dc910d1782dbede6119708d8336991
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fb92bb073e6e1dd327b9ee94bb1e5726e96396bf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2024-01-25 17:27:45 +01:00 committed by Qt Cherry-pick Bot
parent de62bb90ec
commit 0710865eed
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/widgets/widgets/qdockwidget.cpp
View File

@ -1836,27 +1836,6 @@ QWidget *QDockWidget::titleBarWidget() const
return layout->widgetForRole(QDockWidgetLayout::TitleBar); return layout->widgetForRole(QDockWidgetLayout::TitleBar);
} }
#ifndef QT_NO_DEBUG_STREAM
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();
dbg << ";))";
return dbg;
}
#endif // QT_NO_DEBUG_STREAM
QT_END_NAMESPACE QT_END_NAMESPACE
#include "qdockwidget.moc" #include "qdockwidget.moc"

5
src/widgets/widgets/qdockwidget.h
View File

@ -64,11 +64,6 @@ public:
inline bool isAreaAllowed(Qt::DockWidgetArea area) const inline bool isAreaAllowed(Qt::DockWidgetArea area) const
{ return (allowedAreas() & area) == area; } { 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
#ifndef QT_NO_ACTION #ifndef QT_NO_ACTION
QAction *toggleViewAction() const; QAction *toggleViewAction() const;
#endif #endif