diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-25 18:07:17 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-19 17:52:45 +0200 |
commit | 0d57da067b47eac51ea725d267069d6e616cf586 (patch) | |
tree | 2af737bd8e8ea2063a485e9f66471a457d5eab3f /tests/auto/other | |
parent | c2059ac80db30d0322f53bf0c224263a934c49bc (diff) |
Let platform plugin decide if accessibility is active
Change-Id: I881a8ff3fedf3db73ee37046a4363c70960a92a6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'tests/auto/other')
3 files changed, 13 insertions, 2 deletions
diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index 071b0bb66c..70f6633195 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qaccessibility requires(contains(QT_CONFIG,accessibility)) -QT += testlib gui-private widgets-private +QT += testlib core-private gui-private widgets-private SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 4e0b3298fc..af8e4472ed 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -63,6 +63,9 @@ #include <QtWidgets/private/qaccessiblewidget_p.h> #include <math.h> #include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformaccessibility.h> +#include <QtGui/private/qguiapplication_p.h> #if defined(Q_OS_WIN) && defined(interface) # undef interface @@ -311,6 +314,8 @@ void tst_QAccessibility::onClicked() void tst_QAccessibility::initTestCase() { QTestAccessibility::initialize(); + QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration(); + pfIntegration->accessibility()->setActive(true); } void tst_QAccessibility::cleanupTestCase() diff --git a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp index 15b8089525..79fd29f2a1 100644 --- a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp +++ b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp @@ -55,6 +55,7 @@ #include <QDBusReply> #include "atspi/atspi-constants.h" +#include "bus_interface.h" #include "dbusconnection_p.h" #include "struct_marshallers_p.h" @@ -154,16 +155,21 @@ QDBusInterface *tst_QAccessibilityLinux::getInterface(const QString &path, const return new QDBusInterface(address, path, interfaceName, dbus.connection(), this); } - void tst_QAccessibilityLinux::initTestCase() { // Oxygen style creates many extra items, it's simply unusable here qApp->setStyle("fusion"); qApp->setApplicationName("tst_QAccessibilityLinux app"); + // Pretend we are a screen reader + QDBusConnection c = QDBusConnection::sessionBus(); + OrgA11yStatusInterface *a11yStatus = new OrgA11yStatusInterface(QStringLiteral("org.a11y.Bus"), QStringLiteral("/org/a11y/bus"), c, this); + a11yStatus->setScreenReaderEnabled(true); + QTRY_VERIFY(dbus.isEnabled()); QTRY_VERIFY(dbus.connection().isConnected()); address = dbus.connection().baseService().toLatin1().data(); + QVERIFY(!address.isEmpty()); m_window = new AccessibleTestWindow(); m_window->show(); |