From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Thu, 1 Nov 2012 13:33:36 +0000 (+0100)
Subject: Remove #ifndef QT_NO_ACCESSIBILITY around qaccessible.{h,cpp}
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d45cebbf4d6a8fd2406f41e151a63c9f241879f7;p=profile%2Fivi%2Fqtbase.git

Remove #ifndef QT_NO_ACCESSIBILITY around qaccessible.{h,cpp}

Jens has an use-case for using accessibility from styles.

By making the enums always available regardless of QT_NO_ACCESSIBILITY,
it makes the style code less littered with ifndefs.

It should (ahem) also solve the problem where Qt Desktop components
does not compile if QT_NO_ACCESSIBILITY is not defined.
This happens on some linux distros, since atspi-2-dev is not installed
by default, which again causes grief for those affected.

Change-Id: I15d65df8c752a0c4af37cc7b4d908a757cb6a9c4
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index feaf468..61f1773 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -41,8 +41,6 @@
 
 #include "qaccessible.h"
 
-#ifndef QT_NO_ACCESSIBILITY
-
 #include "qaccessibleplugin.h"
 #include "qaccessibleobject.h"
 #include "qaccessiblebridge.h"
@@ -1265,4 +1263,3 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
 
 QT_END_NAMESPACE
 
-#endif
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 08c0952..1fb6c65 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -58,8 +58,6 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-#ifndef QT_NO_ACCESSIBILITY
-
 class QAccessibleInterface;
 class QAccessibleEvent;
 class QWindow;
@@ -678,8 +676,6 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r
 }
 #endif
 
-#endif // QT_NO_ACCESSIBILITY
-
 QT_END_NAMESPACE
 
 QT_END_HEADER