From b7f63c6bf74a0eb62bb49c1085584da1b3714a06 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Fri, 23 Nov 2012 05:20:04 +0900 Subject: Enable module build with QT_NO_ACCESSIBILITY Change-Id: I330c3ddd70232d94eae5543cb0282b962e67eae5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Frederik Gladhorn --- src/platformsupport/linuxaccessibility/application.cpp | 4 ++++ src/platformsupport/linuxaccessibility/application_p.h | 4 ++++ src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 4 ++++ src/platformsupport/linuxaccessibility/atspiadaptor_p.h | 4 ++++ src/platformsupport/linuxaccessibility/bridge.cpp | 4 ++++ src/platformsupport/linuxaccessibility/bridge_p.h | 4 ++++ src/platformsupport/linuxaccessibility/cache.cpp | 4 ++++ src/platformsupport/linuxaccessibility/cache_p.h | 4 ++++ src/platformsupport/linuxaccessibility/constant_mappings.cpp | 4 ++++ src/platformsupport/linuxaccessibility/constant_mappings_p.h | 3 +++ src/platformsupport/linuxaccessibility/dbusconnection.cpp | 4 ++++ src/platformsupport/linuxaccessibility/dbusconnection_p.h | 4 ++++ src/platformsupport/linuxaccessibility/struct_marshallers.cpp | 4 ++++ 13 files changed, 51 insertions(+) (limited to 'src/platformsupport') diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/platformsupport/linuxaccessibility/application.cpp index c2049e536a..22059de864 100644 --- a/src/platformsupport/linuxaccessibility/application.cpp +++ b/src/platformsupport/linuxaccessibility/application.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /*! \class QSpiApplicationAdaptor \internal @@ -217,4 +219,6 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error } } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h index 14b8a71b42..4a60bbfe84 100644 --- a/src/platformsupport/linuxaccessibility/application_p.h +++ b/src/platformsupport/linuxaccessibility/application_p.h @@ -49,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /* * Used for the root object. * @@ -80,6 +82,8 @@ private: QDBusConnection dbusConnection; }; +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index 0db8e31537..c88f89b634 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -65,6 +65,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + static bool isDebugging = false; #define qAtspiDebug if (!::isDebugging); else qDebug @@ -2356,4 +2358,6 @@ bool AtSpiAdaptor::tableInterface(const QAIPointer &interface, const QString &fu return true; } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h index 5b5eb60228..e6f95195fe 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h +++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h @@ -56,6 +56,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + class QAccessibleInterface; class QSpiAccessibleInterface; class QSpiApplicationAdaptor; @@ -216,6 +218,8 @@ private: uint sendWindow_unshade : 1; }; +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp index f22dc4e191..bf2486fc57 100644 --- a/src/platformsupport/linuxaccessibility/bridge.cpp +++ b/src/platformsupport/linuxaccessibility/bridge.cpp @@ -56,6 +56,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /*! \class QSpiAccessibleBridge \internal @@ -182,4 +184,6 @@ void QSpiAccessibleBridge::initializeConstantMappings() qSpiRoleMapping.insert(map[i].role, RoleNames(map[i].spiRole, QLatin1String(map[i].name), tr(map[i].name))); } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h index f7c243cfbb..3865e06489 100644 --- a/src/platformsupport/linuxaccessibility/bridge_p.h +++ b/src/platformsupport/linuxaccessibility/bridge_p.h @@ -51,6 +51,8 @@ class DeviceEventControllerAdaptor; QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + class DBusConnection; class QSpiDBusCache; class AtSpiAdaptor; @@ -79,6 +81,8 @@ private: bool initialized; }; +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/platformsupport/linuxaccessibility/cache.cpp b/src/platformsupport/linuxaccessibility/cache.cpp index 81a54a1ce5..9201fc1d8b 100644 --- a/src/platformsupport/linuxaccessibility/cache.cpp +++ b/src/platformsupport/linuxaccessibility/cache.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /*! \class QSpiDBusCache \internal @@ -89,4 +91,6 @@ QSpiAccessibleCacheArray QSpiDBusCache::GetItems() return cacheArray; } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h index 898f06f0d6..4b606eadb1 100644 --- a/src/platformsupport/linuxaccessibility/cache_p.h +++ b/src/platformsupport/linuxaccessibility/cache_p.h @@ -49,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + class QSpiDBusCache : public QObject { Q_OBJECT @@ -66,6 +68,8 @@ public Q_SLOTS: QSpiAccessibleCacheArray GetItems(); }; +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/platformsupport/linuxaccessibility/constant_mappings.cpp index 1840868aa2..5138b9a163 100644 --- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp +++ b/src/platformsupport/linuxaccessibility/constant_mappings.cpp @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + QHash qSpiRoleMapping; quint64 spiStatesFromQState(QAccessible::State state) @@ -154,4 +156,6 @@ AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relat return ATSPI_RELATION_NULL; } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h index 837a68516d..870a3a4b2a 100644 --- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h +++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h @@ -53,6 +53,7 @@ #include #include +#ifndef QT_NO_ACCESSIBILITY // interface names from at-spi2-core/atspi/atspi-misc-private.h #define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry" @@ -135,4 +136,6 @@ AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relat QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_ACCESSIBILITY + #endif /* Q_SPI_CONSTANT_MAPPINGS_H */ diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp index a99e8f0a5e..a38570a465 100644 --- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp +++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /*! \class DBusConnection \internal @@ -104,4 +106,6 @@ QDBusConnection DBusConnection::connection() const return dbusConnection; } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h index 674cf28c34..da090da9cf 100644 --- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h +++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h @@ -49,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + class DBusConnection { public: @@ -62,6 +64,8 @@ private: QDBusConnection dbusConnection; }; +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp index 713e26f25a..027993c4bd 100644 --- a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp +++ b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + QSpiObjectReference::QSpiObjectReference() : path(QDBusObjectPath(ATSPI_DBUS_PATH_NULL)) {} @@ -234,4 +236,6 @@ void qSpiInitializeStructTypes() qDBusRegisterMetaType(); } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE -- cgit v1.2.3