diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
| commit | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch) | |
| tree | 10733cb3fb35647b19cfd15ab158f56b1cb550e1 /src/gui/accessible | |
| parent | 21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff) | |
| parent | a8321f21fb82714771b4717c99dd475f2c74649e (diff) | |
Merge branch 'stable' into dev
Conflicts:
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'src/gui/accessible')
| -rw-r--r-- | src/gui/accessible/qaccessible.cpp | 14 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessible.h | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index a32f771bd0..28a3afbbf0 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -56,8 +56,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY - /*! \class QAccessible \brief The QAccessible class provides enums and static functions @@ -442,19 +440,23 @@ QAccessible::RootObjectHandler QAccessible::rootObjectHandler = 0; static bool accessibility_active = false; static bool cleanupAdded = false; +#ifndef QT_NO_ACCESSIBILITY static QPlatformAccessibility *platformAccessibility() { QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration(); return pfIntegration ? pfIntegration->accessibility() : 0; } +#endif /*! \internal */ void QAccessible::cleanup() { +#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->cleanup(); +#endif } static void qAccessibleCleanup() @@ -615,8 +617,10 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) mo = mo->superClass(); } +#ifndef QT_NO_ACCESSIBILITY if (object == qApp) return new QAccessibleApplication; +#endif return 0; } @@ -656,8 +660,10 @@ void QAccessible::setRootObject(QObject *object) return; } +#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->setRootObject(object); +#endif } /*! @@ -689,8 +695,10 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event) if (!isActive()) return; +#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->notifyAccessibilityUpdate(event); +#endif } #if QT_DEPRECATED_SINCE(5, 0) @@ -1544,7 +1552,5 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev) #endif -#endif // QT_NO_ACCESSIBILITY - QT_END_NAMESPACE diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 5bcf9e7d0d..5f61634ba2 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY class QAccessibleInterface; class QAccessibleEvent; @@ -677,8 +676,6 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r } #endif -#endif // QT_NO_ACCESSIBILITY - QT_END_NAMESPACE QT_END_HEADER |