diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-07-01 12:33:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-07-01 13:21:29 +0200 |
| commit | 200fdd96f0aae9d2060cf3b8cb491eda10d6d68f (patch) | |
| tree | 80b3a1450c3fa8cbd44e07d82f6f5d3985a5902e /src/widgets/widgets/qdockwidget.cpp | |
| parent | cb260c6c7f1ebd4b3fa5f86c3d98ec8ff0486095 (diff) | |
| parent | e2665600c09358854bb0b29389cc873a2684f77b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
configure.json
Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
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 e8c5502ae6..d2fa9a7c06 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1390,8 +1390,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; @@ -1481,9 +1479,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: |