From c3042d2efa5e05e4e38f96b7d4b7e0fd00d16bb6 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Date: Tue, 14 Nov 2023 13:16:12 +0900
Subject: [PATCH] Fix build with -no-feature-dockwidget

Pick-to: 6.5
Change-Id: Ie6d4e9a2dcfa6da5392bfb2507aafc57b6511ba3
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit d5dbafca1f83ef97f65c588af2d98c894503df27)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/widgets/widgets/qmainwindowlayout.cpp | 2 +-
 src/widgets/widgets/qmainwindowlayout_p.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index fc0bb07e864..99357a83514 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -2712,7 +2712,7 @@ QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, QDockWidgetPrivate::Drag
 #endif
 
 #if !QT_CONFIG(dockwidget) || !QT_CONFIG(tabbar)
-    Q_UNUSED(group);
+    Q_UNUSED(scope);
 #endif
 
     layoutState.unplug(path ,&savedState);
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 4d2fc614e46..44ecb08e204 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -29,11 +29,17 @@
 #include "QtCore/qset.h"
 #include "private/qlayoutengine_p.h"
 #include "private/qwidgetanimator_p.h"
+#if QT_CONFIG(dockwidget)
 #include "private/qdockwidget_p.h"
 
-#if QT_CONFIG(dockwidget)
 #include "qdockarealayout_p.h"
 #include "qdockwidget.h"
+#else
+struct QDockWidgetPrivate {
+    enum class DragScope {
+        Group
+    };
+};
 #endif
 #if QT_CONFIG(toolbar)
 #include "qtoolbararealayout_p.h"