summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qmainwindow.h
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-08 12:32:29 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-08 16:26:36 +0200
commitf44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (patch)
tree580aa25716bfc88d57f15ad68f7bfa727aebc400 /src/widgets/widgets/qmainwindow.h
parentf955bd8ced8b93d142b7f755665946424c6d3644 (diff)
parent3622ebaac51abd2e4d1541120ae3b6e42932359f (diff)
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/widgets/widgets/qmainwindow.h')
-rw-r--r--src/widgets/widgets/qmainwindow.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index 85e3f87d77..c69451fa3e 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -171,8 +171,10 @@ public:
Qt::Orientation orientation);
void splitDockWidget(QDockWidget *after, QDockWidget *dockwidget,
Qt::Orientation orientation);
+#if QT_CONFIG(tabbar)
void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
QList<QDockWidget*> tabifiedDockWidgets(QDockWidget *dockwidget) const;
+#endif
void removeDockWidget(QDockWidget *dockwidget);
bool restoreDockWidget(QDockWidget *dockwidget);