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

QMainWindowLayout: remove redundant #ifdef'ry

Browse Source 
Remove #if QT_CONFIG(dockwidget) nested within each other.

Pick-to: 6.5
Change-Id: I6c662909676ffada3ac52e41a9c2d8b9fd491689
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit 0e435b7f13619106d61c9701e53803d3c488fea3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-11-14 09:46:55 +01:00 committed by Qt Cherry-pick Bot
parent b8879bb17b
commit 65f59d96c7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -1507,7 +1507,6 @@ void QMainWindowLayout::showDockWidgets() const
// Checks if QDockWidgetGroupWindow or QDockWidget can be plugged the area indicated by path. // Checks if QDockWidgetGroupWindow or QDockWidget can be plugged the area indicated by path.
// Returns false if called with invalid widget type or if compiled without dockwidget support. // Returns false if called with invalid widget type or if compiled without dockwidget support.
#if QT_CONFIG(dockwidget)
static bool isAreaAllowed(QWidget *widget, const QList<int> &path) static bool isAreaAllowed(QWidget *widget, const QList<int> &path)
{ {
Q_ASSERT_X((path.size() > 1), "isAreaAllowed", "invalid path size"); Q_ASSERT_X((path.size() > 1), "isAreaAllowed", "invalid path size");
@ -1542,7 +1541,6 @@ static bool isAreaAllowed(QWidget *widget, const QList<int> &path)
qCDebug(lcQpaDockWidgets) << "Docking requested for invalid widget type (coding error)." << widget << area; qCDebug(lcQpaDockWidgets) << "Docking requested for invalid widget type (coding error)." << widget << area;
return false; return false;
} }
#endif
void QMainWindowLayout::setCorner(Qt::Corner corner, Qt::DockWidgetArea area) void QMainWindowLayout::setCorner(Qt::Corner corner, Qt::DockWidgetArea area)
{ {
@ -1562,7 +1560,6 @@ Qt::DockWidgetArea QMainWindowLayout::corner(Qt::Corner corner) const
// Returns the rectangle of a dockWidgetArea // Returns the rectangle of a dockWidgetArea
// if max is true, the maximum possible rectangle for dropping is returned // if max is true, the maximum possible rectangle for dropping is returned
// the current visible rectangle otherwise // the current visible rectangle otherwise
#if QT_CONFIG(dockwidget)
QRect QMainWindowLayout::dockWidgetAreaRect(const Qt::DockWidgetArea area, DockWidgetAreaSize size) const QRect QMainWindowLayout::dockWidgetAreaRect(const Qt::DockWidgetArea area, DockWidgetAreaSize size) const
{ {
const QInternal::DockPosition dockPosition = toDockPos(area); const QInternal::DockPosition dockPosition = toDockPos(area);
@ -1578,7 +1575,6 @@ QRect QMainWindowLayout::dockWidgetAreaRect(const Qt::DockWidgetArea area, DockW
// Return maximum or visible rectangle // Return maximum or visible rectangle
return (size == Maximum) ? dl.gapRect(dockPosition) : dl.docks[dockPosition].rect; return (size == Maximum) ? dl.gapRect(dockPosition) : dl.docks[dockPosition].rect;
} }
#endif
void QMainWindowLayout::addDockWidget(Qt::DockWidgetArea area, void QMainWindowLayout::addDockWidget(Qt::DockWidgetArea area,
QDockWidget *dockwidget, QDockWidget *dockwidget,