diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-03-08 16:32:05 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 11:39:50 +0100 |
commit | bfa7648ca452ebaf42bd10c84a2820d977eb770d (patch) | |
tree | 89230b5bac773ddb840a46f27e6c548e8dcb02b0 /src | |
parent | c8262855f4b0ff50ac3259904545cb8ac26848c5 (diff) |
Remove all accessibility updates to allow changes in qtbase.
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickaccessibleattached.cpp | 1 | ||||
-rw-r--r-- | src/quick/items/qquickaccessibleattached_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 9 |
4 files changed, 0 insertions, 16 deletions
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp index fcf62fa910..46f85417d2 100644 --- a/src/quick/items/qquickaccessibleattached.cpp +++ b/src/quick/items/qquickaccessibleattached.cpp @@ -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() diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 4fc6d90bd8..129c3ef240 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -85,7 +85,6 @@ public: if (name != m_name) { m_name = name; emit nameChanged(); - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, parent())); } } @@ -95,7 +94,6 @@ public: if (m_description != description) { m_description = description; emit descriptionChanged(); - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DescriptionChanged, parent())); } } diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 70fbbab18f..2d84b43008 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3018,7 +3018,6 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event) void QQuickItem::focusInEvent(QFocusEvent *) { - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this)); } void QQuickItem::focusOutEvent(QFocusEvent *) @@ -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(); diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index a353d0c91f..0b21d6b169 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -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 } @@ -3890,10 +3885,6 @@ bool QQuickTextInputPrivate::emitCursorPositionChanged() } } -#ifndef QT_NO_ACCESSIBILITY - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextCaretMoved, q)); -#endif - return true; } return false; |