From 4cceceff155a6d43cb0ac312d3055390cfc75201 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Wed, 2 Jul 2014 14:10:30 +0200
Subject: Compile with -no-feature-accessibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-38045
Change-Id: Id436b70aa6161bdf2428ca0a605212b278c71849
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
 src/platformsupport/accessibility/qaccessiblebridgeutils_p.h  | 4 ++--
 src/platformsupport/linuxaccessibility/application.cpp        | 3 +++
 src/platformsupport/linuxaccessibility/application_p.h        | 4 ++++
 src/platformsupport/linuxaccessibility/atspiadaptor.cpp       | 2 ++
 src/platformsupport/linuxaccessibility/atspiadaptor_p.h       | 2 ++
 src/platformsupport/linuxaccessibility/bridge.cpp             | 2 ++
 src/platformsupport/linuxaccessibility/bridge_p.h             | 2 ++
 src/platformsupport/linuxaccessibility/cache.cpp              | 6 ++++--
 src/platformsupport/linuxaccessibility/cache_p.h              | 2 ++
 src/platformsupport/linuxaccessibility/constant_mappings.cpp  | 2 ++
 src/platformsupport/linuxaccessibility/constant_mappings_p.h  | 2 ++
 src/platformsupport/linuxaccessibility/struct_marshallers.cpp | 2 ++
 src/platformsupport/linuxaccessibility/struct_marshallers_p.h | 2 ++
 13 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h b/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
index d05934b844..e888196423 100644
--- a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
+++ b/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
@@ -42,11 +42,11 @@
 #ifndef QACCESSIBLEBRIDGEUTILS_H
 #define QACCESSIBLEBRIDGEUTILS_H
 
-#ifndef QT_NO_ACCESSIBILITY
-
 #include <QtCore/qstringlist.h>
 #include <QtGui/qaccessible.h>
 
+#ifndef QT_NO_ACCESSIBILITY
+
 QT_BEGIN_NAMESPACE
 
 namespace QAccessibleBridgeUtils {
diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/platformsupport/linuxaccessibility/application.cpp
index c651d604ae..bb0a34f879 100644
--- a/src/platformsupport/linuxaccessibility/application.cpp
+++ b/src/platformsupport/linuxaccessibility/application.cpp
@@ -46,6 +46,7 @@
 #include <QtDBus/qdbuspendingreply.h>
 #include <qdebug.h>
 
+#ifndef QT_NO_ACCESSIBILITY
 #include "deviceeventcontroller_adaptor.h"
 #include "atspi/atspi-constants.h"
 
@@ -235,3 +236,5 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error
 }
 
 QT_END_NAMESPACE
+
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h
index 72c27c0d88..8aef66beb9 100644
--- a/src/platformsupport/linuxaccessibility/application_p.h
+++ b/src/platformsupport/linuxaccessibility/application_p.h
@@ -47,6 +47,8 @@
 #include <QtDBus/QDBusConnection>
 #include <QtGui/QAccessibleInterface>
 
+#ifndef QT_NO_ACCESSIBILITY
+
 QT_BEGIN_NAMESPACE
 
 /*
@@ -83,4 +85,6 @@ private:
 
 QT_END_NAMESPACE
 
+#endif //QT_NO_ACCESSIBILITY
+
 #endif
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 48cd01413f..d4454e4b9f 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -49,6 +49,7 @@
 
 #include <qdebug.h>
 
+#ifndef QT_NO_ACCESSIBILITY
 #include "socket_interface.h"
 #include "constant_mappings_p.h"
 
@@ -2351,3 +2352,4 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
 }
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
index e1e2f2b149..d3cd510153 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -52,6 +52,7 @@
 #include "dbusconnection_p.h"
 #include "struct_marshallers_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 class QAccessibleInterface;
@@ -212,5 +213,6 @@ private:
 };
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
 
 #endif
diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp
index bfa92609a1..3665b9cefe 100644
--- a/src/platformsupport/linuxaccessibility/bridge.cpp
+++ b/src/platformsupport/linuxaccessibility/bridge.cpp
@@ -52,6 +52,7 @@
 #include "dbusconnection_p.h"
 #include "struct_marshallers_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY
 #include "deviceeventcontroller_adaptor.h"
 
 QT_BEGIN_NAMESPACE
@@ -272,3 +273,4 @@ void QSpiAccessibleBridge::initializeConstantMappings()
 }
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h
index 56018ef14c..d20852789f 100644
--- a/src/platformsupport/linuxaccessibility/bridge_p.h
+++ b/src/platformsupport/linuxaccessibility/bridge_p.h
@@ -48,6 +48,7 @@
 
 class DeviceEventControllerAdaptor;
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 class DBusConnection;
@@ -79,5 +80,6 @@ private:
 };
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
 
 #endif
diff --git a/src/platformsupport/linuxaccessibility/cache.cpp b/src/platformsupport/linuxaccessibility/cache.cpp
index a850c6dec4..a3d2aa5b43 100644
--- a/src/platformsupport/linuxaccessibility/cache.cpp
+++ b/src/platformsupport/linuxaccessibility/cache.cpp
@@ -41,10 +41,11 @@
 
 
 #include "cache_p.h"
-#include "cache_adaptor.h"
-
 #include "bridge_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY
+#include "cache_adaptor.h"
+
 #define QSPI_OBJECT_PATH_CACHE "/org/a11y/atspi/cache"
 
 QT_BEGIN_NAMESPACE
@@ -90,3 +91,4 @@ QSpiAccessibleCacheArray QSpiDBusCache::GetItems()
 }
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h
index dd7ef24e5e..7cecd425a9 100644
--- a/src/platformsupport/linuxaccessibility/cache_p.h
+++ b/src/platformsupport/linuxaccessibility/cache_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/QObject>
 #include "struct_marshallers_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 class QSpiDBusCache : public QObject
@@ -66,5 +67,6 @@ public Q_SLOTS:
 };
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
 
 #endif /* Q_SPI_CACHE_H */
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
index 0bafaa036c..5f6b1f08ea 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp
+++ b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
@@ -53,6 +53,7 @@
 //  "ruler"    "autocomplete"  "edit bar" "embedded component"  "entry"    "caption"
 //  "heading"  "page"  "section"  "redundant object"  "form"  "input method window"  "menu"
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 QHash <QAccessible::Role, RoleNames> qSpiRoleMapping;
@@ -150,3 +151,4 @@ AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relat
 }
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
index 50b7864836..2b86926b5d 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h
+++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
@@ -53,6 +53,7 @@
 #include <QtGui/QAccessible>
 #include <atspi/atspi-constants.h>
 
+#ifndef QT_NO_ACCESSIBILITY
 
 // interface names from at-spi2-core/atspi/atspi-misc-private.h
 #define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry"
@@ -132,5 +133,6 @@ QSpiUIntList spiStateSetFromSpiStates(quint64 states);
 AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relation);
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
 
 #endif /* Q_SPI_CONSTANT_MAPPINGS_H */
diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
index 8c6f4959de..bb765fc2ed 100644
--- a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
+++ b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
@@ -48,6 +48,7 @@
 
 #include "bridge_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 QSpiObjectReference::QSpiObjectReference()
@@ -235,3 +236,4 @@ void qSpiInitializeStructTypes()
 }
 
 QT_END_NAMESPACE
+#endif //QT_NO_ACCESSIBILITY
diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
index fb1e6756eb..c6c7dc2bfa 100644
--- a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
+++ b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
@@ -49,6 +49,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
 
+#ifndef QT_NO_ACCESSIBILITY
 QT_BEGIN_NAMESPACE
 
 typedef QList <int> QSpiIntList;
@@ -172,4 +173,5 @@ Q_DECLARE_METATYPE(QSpiAttributeSet)
 Q_DECLARE_METATYPE(QSpiAppUpdate)
 Q_DECLARE_METATYPE(QSpiDeviceEvent)
 
+#endif //QT_NO_ACCESSIBILITY
 #endif /* Q_SPI_STRUCT_MARSHALLERS_H */
-- 
cgit v1.2.3