Skip to content

Commit

Permalink
Remove all accessibility updates to allow changes in qtbase.
Browse files Browse the repository at this point in the history
In order to integrate pending api changes these are temporarily
removed and will return fixed as soon as qtbase is up to date.

Change-Id: I558b6049ac3342d41d67441ddfba6821fc370533
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
  • Loading branch information
Frederik Gladhorn authored and Qt by Nokia committed Mar 14, 2012
1 parent c826285 commit bfa7648
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/quick/items/qquickaccessibleattached.cpp
Expand Up @@ -144,7 +144,6 @@ QQuickAccessibleAttached::QQuickAccessibleAttached(QObject *parent)
// Enable accessibility for items with accessible content. This also
// enables accessibility for the ancestors of souch items.
item->d_func()->setAccessibleFlagAndListener();
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectCreated, item));
}

QQuickAccessibleAttached::~QQuickAccessibleAttached()
Expand Down
2 changes: 0 additions & 2 deletions src/quick/items/qquickaccessibleattached_p.h
Expand Up @@ -85,7 +85,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject
if (name != m_name) {
m_name = name;
emit nameChanged();
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, parent()));
}
}

Expand All @@ -95,7 +94,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject
if (m_description != description) {
m_description = description;
emit descriptionChanged();
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DescriptionChanged, parent()));
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/quick/items/qquickitem.cpp
Expand Up @@ -3018,7 +3018,6 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event)

void QQuickItem::focusInEvent(QFocusEvent *)
{
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this));
}

void QQuickItem::focusOutEvent(QFocusEvent *)
Expand Down Expand Up @@ -3983,9 +3982,6 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)

itemChange(QQuickItem::ItemVisibleHasChanged, effectiveVisible);

if (isAccessible)
QAccessible::updateAccessibility(QAccessibleEvent(effectiveVisible ? QAccessible::ObjectShow : QAccessible::ObjectHide, q));

emit q->visibleChanged();
if (childVisibilityChanged)
emit q->visibleChildrenChanged();
Expand Down
9 changes: 0 additions & 9 deletions src/quick/items/qquicktextinput.cpp
Expand Up @@ -3261,12 +3261,7 @@ void QQuickTextInputPrivate::internalSetText(const QString &txt, int pos, bool e
m_textDirty = (oldText != m_text);

bool changed = finishChange(-1, true, edited);
#ifdef QT_NO_ACCESSIBILITY
Q_UNUSED(changed)
#else
if (changed)
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextUpdated, q));
#endif
}


Expand Down Expand Up @@ -3890,10 +3885,6 @@ bool QQuickTextInputPrivate::emitCursorPositionChanged()
}
}

#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextCaretMoved, q));
#endif

return true;
}
return false;
Expand Down

0 comments on commit bfa7648

Please sign in to comment.