Revert "QDockWidget: Always show dock widgets with the main window"

This reverts commit 4c60a11. Reason for revert: Breaks QMainWindow::restoreState(). Dock widget is shown, even if restored into hidden state. Change-Id: I9808de4e0fd48871c3b234ae9bbaf6c64c8e832d Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 0ea3730)
autodesk-forks · Apr 3, 2024 · 93106d5 · 93106d5
1 parent db413ca
commit 93106d5
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
@@ -1287,13 +1287,6 @@ bool QMainWindow::event(QEvent *event)
             return true;
 #endif // QT_CONFIG(statustip)
 
-#if QT_CONFIG(dockwidget)
-        case QEvent::Show:
-            Q_ASSERT(d->layout);
-            d->layout->showDockWidgets();
-            break;
-#endif // QT_CONFIG(dockwidget)
-
         case QEvent::StyleChange:
 #if QT_CONFIG(dockwidget)
             Q_ASSERT(d->layout);

diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -1626,17 +1626,6 @@ inline static Qt::DockWidgetArea toDockWidgetArea(int pos)
     return QDockWidgetPrivate::toDockWidgetArea(static_cast<QInternal::DockPosition>(pos));
 }
 
-void QMainWindowLayout::showDockWidgets() const
-{
-    const auto dockWidgets = parent()->findChildren<QDockWidget *>(Qt::FindDirectChildrenOnly);
-    for (auto *dockWidget : dockWidgets)
-        dockWidget->show();
-
-    const auto groupWindows = parent()->findChildren<QDockWidgetGroupWindow *>(Qt::FindDirectChildrenOnly);
-    for (auto *groupWindow : groupWindows)
-        groupWindow->show();
-}
-
 // 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.
 static bool isAreaAllowed(QWidget *widget, const QList<int> &path)

diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -498,7 +498,6 @@ class Q_AUTOTEST_EXPORT QMainWindowLayout
                          Qt::Orientation orientation);
     Qt::DockWidgetArea dockWidgetArea(QWidget* widget) const;
     bool restoreDockWidget(QDockWidget *dockwidget);
-    void showDockWidgets() const;
 #if QT_CONFIG(tabbar)
     void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
     void raise(QDockWidget *widget);