Remove all accessibility updates to allow changes in qtbase.
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Thu, 8 Mar 2012 15:32:05 +0000 (16:32 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 10:39:50 +0000 (11:39 +0100)
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>
src/quick/items/qquickaccessibleattached.cpp
src/quick/items/qquickaccessibleattached_p.h
src/quick/items/qquickitem.cpp
src/quick/items/qquicktextinput.cpp

index fcf62fa..46f8541 100644 (file)
@@ -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()
index 4fc6d90..129c3ef 100644 (file)
@@ -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()));
         }
     }
 
index 70fbbab..2d84b43 100644 (file)
@@ -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();
index a353d0c..0b21d6b 100644 (file)
@@ -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;