summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qdockarealayout.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-29 10:10:22 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-29 10:10:22 +0200
commitf27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch)
treed84389d3c2a37b38435e0be5259f48e5f04290e0 /src/widgets/widgets/qdockarealayout.cpp
parenta8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff)
parent0d720a000f4f35c5ea6942426efec6847b06f4ce (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/widgets/widgets/qdockarealayout.cpp')
-rw-r--r--src/widgets/widgets/qdockarealayout.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index c14fd5a942..ed630913e7 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -2161,6 +2161,9 @@ bool QDockAreaLayoutInfo::updateTabBar() const
if (oldCurrentId > 0 && currentTabId() != oldCurrentId)
that->setCurrentTabId(oldCurrentId);
+ if (QDockWidgetGroupWindow *dwgw = qobject_cast<QDockWidgetGroupWindow *>(tabBar->parent()))
+ dwgw->adjustFlags();
+
//returns if the tabbar is visible or not
return ( (gap ? 1 : 0) + tabBar->count()) > 1;
}