diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-05 12:11:30 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-06 08:23:32 (GMT) |
| commit | bdcb3a821258f3d5f01e7d9b162b24c1c64236e9 (patch) | |
| tree | 05f7af8e9d49defa222c919b6098528cba6d7e6f | |
| parent | 0425cf88f3935858ec1ee13ac3e67a90b3f3e45f (diff) | |
| download | Qt-bdcb3a821258f3d5f01e7d9b162b24c1c64236e9.zip Qt-bdcb3a821258f3d5f01e7d9b162b24c1c64236e9.tar.gz Qt-bdcb3a821258f3d5f01e7d9b162b24c1c64236e9.tar.bz2 | |
QMdiArea: Ignore events of other instances in the event filter.
This caused for example the variable QMdiAreaPrivate::isSubWindowsTiled
being cleared from another instance, which resulted in odd
resizing behavior.
Task-number: QTBUG-31448
Change-Id: I880f7e415d6654e52499df1bfaf99f2c55d86320
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry picked from qtbase/9e2c4bc67f30eb1e8d776afe3a092d5994aaab38)
| -rw-r--r-- | src/gui/widgets/qmdiarea.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp index f5db074..88725c8 100644 --- a/src/gui/widgets/qmdiarea.cpp +++ b/src/gui/widgets/qmdiarea.cpp @@ -2595,6 +2595,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: |