diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /src/plugins/platforms/cocoa/qcocoaaccessibility.mm | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaaccessibility.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaaccessibility.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm index 5649f3ad73..e135f36e78 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm @@ -231,8 +231,7 @@ NSArray *unignoredChildren(id parentObject, QAccessibleInterface *interface) NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids]; for (int i = 0; i < numKids; ++i) { QAccessibleInterface *child = interface->child(i); - Q_ASSERT(child); - if (child->state().invalid || child->state().invisible) + if (!child || !child->isValid() || child->state().invalid || child->state().invisible) continue; QAccessible::Id childId = QAccessible::uniqueId(child); |