diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
| commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
| tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /src/widgets/widgets/qdockwidget.cpp | |
| parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
| parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'src/widgets/widgets/qdockwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 19444f8315..8229028dac 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1392,8 +1392,6 @@ void QDockWidget::changeEvent(QEvent *event) if (QDockAreaLayoutInfo *info = winLayout->layoutState.dockAreaLayout.info(this)) info->updateTabBar(); } - if (QDockWidgetGroupWindow *p = qobject_cast<QDockWidgetGroupWindow *>(parent())) - p->adjustFlags(); } #endif // QT_NO_TABBAR break; @@ -1483,9 +1481,6 @@ bool QDockWidget::event(QEvent *event) } if (!isFloating() && layout != 0 && onTop) layout->raise(this); - if (QDockWidgetGroupWindow *p = qobject_cast<QDockWidgetGroupWindow *>(parent())) - p->adjustFlags(); - break; } case QEvent::WindowActivate: |