Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2

1 files changed, 10 insertions, 11 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index e9995045b1..1a8d263f94 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -852,18 +852,17 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event)
     // during construction of widgets. If you see cases where the
     // cache seems wrong, this call is "to blame", but the code that
     // caches dynamic data should be updated to handle change events.
-    if (!isActive() || !event->accessibleInterface())
-        return;
-
-    if (event->type() == QAccessible::TableModelChanged) {
-        QAccessibleInterface *iface = event->accessibleInterface();
-        if (iface && iface->tableInterface())
-            iface->tableInterface()->modelChange(static_cast<QAccessibleTableModelChangeEvent*>(event));
-    }
+    QAccessibleInterface *iface = event->accessibleInterface();
+    if (isActive() && iface) {
+        if (event->type() == QAccessible::TableModelChanged) {
+            if (iface->tableInterface())
+                iface->tableInterface()->modelChange(static_cast<QAccessibleTableModelChangeEvent*>(event));
+        }
 
-    if (updateHandler) {
-        updateHandler(event);
-        return;
+        if (updateHandler) {
+            updateHandler(event);
+            return;
+        }
     }
 
     if (QPlatformAccessibility *pfAccessibility = platformAccessibility())