summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-05-05 14:11:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-05 21:19:40 +0200
commit9e2c4bc67f30eb1e8d776afe3a092d5994aaab38 (patch)
tree57c7dcd5f074da496a6df595214e0eb5ef490cf8
parent5bca5d0a51366ec4b4a87afeda2013b42290a588 (diff)
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>
-rw-r--r--src/widgets/widgets/qmdiarea.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 600d9b536f..17f73b2809 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -2591,6 +2591,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: