ADS: Integrate newest base repository commits

* Add drag and drop to auto hide

Base repository was merged until commit
65600a4dcd072fd2773b661823816db6392c34eb

Change-Id: I09dd6613869368d3cf0c701055a6972db915561d
Reviewed-by: Thomas Hartmann <[email protected]>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h
index f0e9a8d0e1e..195f634023b 100644
--- a/src/libs/advanceddockingsystem/dockmanager.h
+++ b/src/libs/advanceddockingsystem/dockmanager.h
@@ -48,6 +48,8 @@ struct DockAreaWidgetPrivate;
 class IconProvider;
 class DockFocusController;
 class AutoHideSideBar;
+class AutoHideTab;
+struct AutoHideTabPrivate;
 
 inline constexpr QStringView workspaceFolderName{u"workspaces"};
 inline constexpr QStringView workspaceFileExtension{u"wrk"};
@@ -84,6 +86,8 @@ private:
     friend class DockAreaTitleBar;
     friend class AutoHideDockContainer;
     friend AutoHideSideBar;
+    friend AutoHideTab;
+    friend AutoHideTabPrivate;
 
 public:
     using Super = DockContainerWidget;
@@ -182,8 +186,8 @@ public:
         = 0x40, ///< Close button of an auto hide container collapses the dock instead of hiding it completely
 
         DefaultAutoHideConfig
-        = AutoHideFeatureEnabled
-          | DockAreaHasAutoHideButton ///< the default configuration for left and right side bars
+        = AutoHideFeatureEnabled | DockAreaHasAutoHideButton
+          | AutoHideCloseButtonCollapsesDock ///< the default configuration for left and right side bars
     };
     Q_DECLARE_FLAGS(AutoHideFlags, eAutoHideFlag)