From 4ca3bcd1d25a84cffb3c1d0628d7b8f5f0e86225 Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Fri, 4 Apr 2025 19:37:59 +0500 Subject: [PATCH] QMainWindowLayout: Fix build with -no-feature-dockwidget Make deletion of unused tab bars conditional to dockwidget and tabwidget features. Task-number: QTBUG-135468 Pick-to: 6.5 Change-Id: I0ecb55ab20737f401796cdd4ebbc6040e54b5afe Reviewed-by: Axel Spoerl (cherry picked from commit b37f84ba414f36d941d42f7addb2f8ca1516d3d6) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 541d53f28dfb23ed5822ae3a7c03f2098ee4ddf9) --- src/widgets/widgets/qmainwindowlayout.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 4d071191f0e..1b1ed49c540 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -2725,10 +2725,12 @@ QMainWindowLayout::~QMainWindowLayout() delete statusbar; +#if QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget) // unusedTabBars contains unparented tab bars, which need to be removed manually. // ~QMainWindowTabBar() removes the bar from unusedTabBars => call qDeleteAll() on a copy. const auto bars = unusedTabBars; qDeleteAll(bars); +#endif // QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget) } void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts)