diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
| commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
| tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /src/platformsupport/linuxaccessibility/atspiadaptor.cpp | |
| parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
| parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'src/platformsupport/linuxaccessibility/atspiadaptor.cpp')
| -rw-r--r-- | src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index 3d91f883f9..4cd81b2389 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -1104,22 +1104,10 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event) } break; } -// case QAccessible::TableModelChanged: { -// // This is rather evil. We don't send data and hope that at-spi fetches the right child. -// // This hack fails when a row gets removed and a different one added in its place. -// QDBusVariant data; -// emit ChildrenChanged("add", 0, 0, data, spiBridge->getRootReference()); -// break; -// } - // case QAccessible::TableModelChanged: - // QAccessible2::TableModelChange change = interface->tableInterface()->modelChange(); - // // assume we should reset if everything is 0 - // if (change.firstColumn == 0 && change.firstRow == 0 && change.lastColumn == 0 && change.lastRow == 0) { - // notifyAboutDestruction(accessible); - // notifyAboutCreation(accessible); - // } - // break; - + case QAccessible::TableModelChanged: + // For now we ignore this event and hope that + // setting manages_descendants works. + break; case QAccessible::ParentChanged: break; case QAccessible::DialogStart: @@ -1181,7 +1169,7 @@ void AtSpiAdaptor::notifyAboutCreation(const QAIPointer &interface) const void AtSpiAdaptor::notifyAboutDestruction(const QAIPointer &interface) const { - if (!interface->isValid()) + if (!interface || !interface->isValid()) return; QAIPointer parent(interface->parent()); |