diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 05:20:04 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-20 13:39:50 +0100 |
| commit | b7f63c6bf74a0eb62bb49c1085584da1b3714a06 (patch) | |
| tree | c1491285c4593d342e59291317c8f6e23aa00d3f /src/gui/accessible | |
| parent | bc71836fc46b308b767af86a42ad5b6e01b78c1f (diff) | |
| download | qtbase-b7f63c6bf74a0eb62bb49c1085584da1b3714a06.tar.gz | |
Enable module build with QT_NO_ACCESSIBILITY
Change-Id: I330c3ddd70232d94eae5543cb0282b962e67eae5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
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, 7 insertions, 10 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index f55037c37a..47d159380d 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /*! \class QAccessible \brief The QAccessible class provides enums and static functions @@ -437,23 +439,19 @@ 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() @@ -597,10 +595,8 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) mo = mo->superClass(); } -#ifndef QT_NO_ACCESSIBILITY if (object == qApp) return new QAccessibleApplication; -#endif return 0; } @@ -640,10 +636,8 @@ void QAccessible::setRootObject(QObject *object) return; } -#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->setRootObject(object); -#endif } /*! @@ -675,10 +669,8 @@ 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) @@ -1532,5 +1524,7 @@ 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 5f61634ba2..5bcf9e7d0d 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -57,6 +57,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY class QAccessibleInterface; class QAccessibleEvent; @@ -676,6 +677,8 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r } #endif +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER |