1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with -no-feature-dockwidget

Browse Source 
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>
This commit is contained in:
Tasuku Suzuki 2023-11-14 13:16:12 +09:00 committed by Qt Cherry-pick Bot
parent 67637f2c40
commit c3042d2efa
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -2712,7 +2712,7 @@ QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, QDockWidgetPrivate::Drag
#endif #endif
#if !QT_CONFIG(dockwidget) || !QT_CONFIG(tabbar) #if !QT_CONFIG(dockwidget) || !QT_CONFIG(tabbar)
Q_UNUSED(group); Q_UNUSED(scope);
#endif #endif
layoutState.unplug(path ,&savedState); layoutState.unplug(path ,&savedState);

8
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -29,11 +29,17 @@
#include "QtCore/qset.h" #include "QtCore/qset.h"
#include "private/qlayoutengine_p.h" #include "private/qlayoutengine_p.h"
#include "private/qwidgetanimator_p.h" #include "private/qwidgetanimator_p.h"
#if QT_CONFIG(dockwidget)
#include "private/qdockwidget_p.h" #include "private/qdockwidget_p.h"
#if QT_CONFIG(dockwidget)
#include "qdockarealayout_p.h" #include "qdockarealayout_p.h"
#include "qdockwidget.h" #include "qdockwidget.h"
#else
struct QDockWidgetPrivate {
enum class DragScope {
Group
};
};
#endif #endif
#if QT_CONFIG(toolbar) #if QT_CONFIG(toolbar)
#include "qtoolbararealayout_p.h" #include "qtoolbararealayout_p.h"