diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-21 10:29:13 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-25 09:16:27 +0000 |
| commit | 0590da532e3349715b0f35eca930ce3ff5588115 (patch) | |
| tree | db616c7fa84f3a9c0dacaaf084609d2a11a3ab4b /src/widgets/widgets/qdockwidget_p.h | |
| parent | 86fc0b0e88c3a798be292cf3979f0e05b105feeb (diff) | |
QDockWidget: Store tab position when undocking
Add a field remembering the tab position of the dock widget area to
QDockWidgetPrivate and use that when grouping floating docks.
Fixes: QTBUG-74242
Change-Id: I2a453080cb39dd4a5491976f1aeca70ae681682a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/widgets/qdockwidget_p.h')
| -rw-r--r-- | src/widgets/widgets/qdockwidget_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 03d7efce98..e224ba7143 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -57,6 +57,10 @@ #include "QtWidgets/qboxlayout.h" #include "QtWidgets/qdockwidget.h" +#if QT_CONFIG(tabwidget) +# include "QtWidgets/qtabwidget.h" +#endif + QT_REQUIRE_CONFIG(dockwidget); QT_BEGIN_NAMESPACE @@ -86,6 +90,11 @@ public: void _q_toggleTopLevel(); // private slot void updateButtons(); + +#if QT_CONFIG(tabwidget) + QTabWidget::TabPosition tabPosition = QTabWidget::North; +#endif + DragState *state = nullptr; QDockWidget::DockWidgetFeatures features = QDockWidget::DockWidgetClosable |