diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-07 13:31:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-07 13:31:20 +0200 |
| commit | a1d66c9aee9a3155f559e7bb00751d1632194183 (patch) | |
| tree | 333dfa02ab084001dd8662b15a3805f54f271dc1 /src/plugins/platforms/windows | |
| parent | ded6514de8b9975f1afd4f63b852c732e0125551 (diff) | |
| parent | f49d5b578cfca311654e09a5161588401fc3815a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp index 69541b4c1a..d0eb8485fa 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp @@ -151,7 +151,7 @@ void QWindowsAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event) // An event has to be associated with a window, // so find the first parent that is a widget and that has a WId QAccessibleInterface *iface = event->accessibleInterface(); - if (!iface) // ### This should not happen, maybe make it an assert. + if (!iface || !iface->isValid()) return; QWindow *window = QWindowsAccessibility::windowHelper(iface); |