summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authoraavit <eirik.aavitsland@digia.com>2013-01-02 14:21:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-04 13:20:06 +0100
commit4250fa2cf607a21dedc0588497498f82e77fb390 (patch)
tree5b9db7e9c0732ac3f786f4deb14513f6f69c2c0b /src/gui
parent9cfce43f19af87bc0a929b917da2901de7dbc193 (diff)
Revert "Enable module build with QT_NO_ACCESSIBILITY"
This reverts commit b7f63c6bf74a0eb62bb49c1085584da1b3714a06. It made compilation fail in qstylehelper_p.h if QT_NO_ACCESSIBILITY was defined - which it is by default on linux without dbus. Change-Id: I313f5138460d28c44dad128d175df0e53a99287d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/accessible/qaccessible.cpp14
-rw-r--r--src/gui/accessible/qaccessible.h3
2 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 47d159380d..f55037c37a 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -55,8 +55,6 @@
QT_BEGIN_NAMESPACE
-#ifndef QT_NO_ACCESSIBILITY
-
/*!
\class QAccessible
\brief The QAccessible class provides enums and static functions
@@ -439,19 +437,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()
@@ -595,8 +597,10 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
mo = mo->superClass();
}
+#ifndef QT_NO_ACCESSIBILITY
if (object == qApp)
return new QAccessibleApplication;
+#endif
return 0;
}
@@ -636,8 +640,10 @@ void QAccessible::setRootObject(QObject *object)
return;
}
+#ifndef QT_NO_ACCESSIBILITY
if (QPlatformAccessibility *pfAccessibility = platformAccessibility())
pfAccessibility->setRootObject(object);
+#endif
}
/*!
@@ -669,8 +675,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)
@@ -1524,7 +1532,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