diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-02-20 15:58:00 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-19 14:39:08 +0000 |
| commit | dd96a62fca461dd4227947469d99f59f9358c028 (patch) | |
| tree | 33d19806101ee69ad8d21d687df7d484e4e4b0ae /tests/auto/widgets/dialogs | |
| parent | eba1d56fad03198098f3eea353c4b42fac3306a7 (diff) | |
Fix focusObjectDuringDestruction crash
Don’t assume that there is an active modal widget
on QApplication::focusChanged(). That signal can also
be emitted on focus clear during dialog destruction.
Task-number: QTBUG-66536
Change-Id: I20c64339c56a52b39c26a7683b62779deba576d9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/widgets/dialogs')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 05410f4a0f..69621a6c09 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -1521,7 +1521,8 @@ public: const QWindow *window = QGuiApplication::topLevelWindows().constFirst(); const QFileDialog *fileDialog = qobject_cast<QFileDialog*>(QApplication::activeModalWidget()); - QVERIFY(fileDialog); + if (!fileDialog) + return; // The problem in QTBUG-57193 was from a platform input context plugin that was // connected to QWindow::focusObjectChanged(), and consequently accessed the focus |