summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-26 10:07:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-26 10:07:23 (GMT)
commit8382808771e73a599deee2af536ae3aba75dc6f9 (patch)
tree389c849aa95fd596e2905cb7106df406a032b683
parentac30504ceaa95064f38eecd77158a930f2c89c59 (diff)
parent1dd59e4cf52b189d6ddf9fe7ff46a30e64e5a2ac (diff)
downloadQt-8382808771e73a599deee2af536ae3aba75dc6f9.zip
Qt-8382808771e73a599deee2af536ae3aba75dc6f9.tar.gz
Qt-8382808771e73a599deee2af536ae3aba75dc6f9.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Check if bridge plugin vector is still valid.
-rw-r--r--src/gui/accessible/qaccessible_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/accessible/qaccessible_unix.cpp b/src/gui/accessible/qaccessible_unix.cpp
index 19fbe78..1c1eb2a 100644
--- a/src/gui/accessible/qaccessible_unix.cpp
+++ b/src/gui/accessible/qaccessible_unix.cpp
@@ -96,7 +96,7 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
}
initialize();
- if (bridges()->isEmpty())
+ if (!bridges() || bridges()->isEmpty())
return;
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(o);