diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:44:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:21:22 +0200 |
| commit | b5552bab40f2e165cf7196993ffc83785f4d8264 (patch) | |
| tree | 5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /src/widgets/widgets/qmdiarea.cpp | |
| parent | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff) | |
| parent | 01ce104a3ee3c8af68f6694840931661666984ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'src/widgets/widgets/qmdiarea.cpp')
| -rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index d0488d5955..beabaa87da 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -2606,6 +2606,9 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event) return QAbstractScrollArea::eventFilter(object, event); } + if (subWindow->mdiArea() != this) + return QAbstractScrollArea::eventFilter(object, event); + // QMdiSubWindow events: switch (event->type()) { case QEvent::Move: |