diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2023-11-14 09:46:55 +0100 |
|---|---|---|
| committer | Axel Spoerl <axel.spoerl@qt.io> | 2023-11-14 15:05:19 +0100 |
| commit | 0e435b7f13619106d61c9701e53803d3c488fea3 (patch) | |
| tree | 54966dd51208cff8b1c5ddd736ce202a914ab0f8 | |
| parent | 0d07725f6beb7916a46a01e067e3c7303d0a0b85 (diff) | |
QMainWindowLayout: remove redundant #ifdef'ry
Remove #if QT_CONFIG(dockwidget) nested within each other.
Pick-to: 6.6 6.5
Change-Id: I6c662909676ffada3ac52e41a9c2d8b9fd491689
Reviewed-by: David Faure <david.faure@kdab.com>
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index fc0bb07e86..6a34694d14 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -1496,7 +1496,6 @@ inline static Qt::DockWidgetArea toDockWidgetArea(int pos) // 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. -#if QT_CONFIG(dockwidget) static bool isAreaAllowed(QWidget *widget, const QList<int> &path) { Q_ASSERT_X((path.size() > 1), "isAreaAllowed", "invalid path size"); @@ -1531,7 +1530,6 @@ static bool isAreaAllowed(QWidget *widget, const QList<int> &path) qCDebug(lcQpaDockWidgets) << "Docking requested for invalid widget type (coding error)." << widget << area; return false; } -#endif void QMainWindowLayout::setCorner(Qt::Corner corner, Qt::DockWidgetArea area) { @@ -1551,7 +1549,6 @@ Qt::DockWidgetArea QMainWindowLayout::corner(Qt::Corner corner) const // Returns the rectangle of a dockWidgetArea // if max is true, the maximum possible rectangle for dropping is returned // the current visible rectangle otherwise -#if QT_CONFIG(dockwidget) QRect QMainWindowLayout::dockWidgetAreaRect(const Qt::DockWidgetArea area, DockWidgetAreaSize size) const { const QInternal::DockPosition dockPosition = toDockPos(area); @@ -1567,7 +1564,6 @@ QRect QMainWindowLayout::dockWidgetAreaRect(const Qt::DockWidgetArea area, DockW // Return maximum or visible rectangle return (size == Maximum) ? dl.gapRect(dockPosition) : dl.docks[dockPosition].rect; } -#endif void QMainWindowLayout::addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget, |