Fix build with -no-feature-dockwidget
Pick-to: 6.6 6.5 Change-Id: Ie6d4e9a2dcfa6da5392bfb2507aafc57b6511ba3 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
parent
98ca28f7a6
commit
d5dbafca1f
@ -2719,7 +2719,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);
|
||||||
|
@ -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"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user