diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2012-11-01 17:50:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 16:59:50 +0100 |
| commit | 4c1c8207b9ace89d727e3bd98ae77c4282672172 (patch) | |
| tree | aa98cd773d0ac8aff92d3712715e4e71d68424b3 /tests | |
| parent | 15b5ed3294dc03e51f84a9d0163283f35e570944 (diff) | |
Accessibility Linux: Do not depend on external libatspi2
This has (and still does) caused lots of grief since
it means accessibility was often unintendedly not built.
Instead copy the lib-at-spi-2 header file needed for the
type enum and build it by default again.
Change-Id: I1ba26f20edff1aeb444c96a37928f36230ac7576
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro | 7 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro index a6fb145604..a9705453e9 100644 --- a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro +++ b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro @@ -3,15 +3,12 @@ CONFIG += testcase # This is temporary to start running the test as part of normal CI. CONFIG += insignificant_test # QTBUG-27732 +include($$QT_SOURCE_TREE/src/platformsupport/linuxaccessibility/linuxaccessibility.pri) TARGET = tst_qaccessibilitylinux -SOURCES += tst_qaccessibilitylinux.cpp \ - ../../../../src/platformsupport/linuxaccessibility/dbusconnection.cpp \ - ../../../../src/platformsupport/linuxaccessibility/struct_marshallers.cpp +SOURCES += tst_qaccessibilitylinux.cpp CONFIG += gui -CONFIG += link_pkgconfig QT += gui gui-private widgets dbus testlib -PKGCONFIG += atspi-2 diff --git a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp index d2dce85e1d..9ecd352dd4 100644 --- a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp +++ b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp @@ -54,10 +54,10 @@ #include <QDBusInterface> #include <QDBusReply> -#include <atspi/atspi-constants.h> +#include "atspi/atspi-constants.h" -#include "../../../../src/platformsupport/linuxaccessibility/dbusconnection_p.h" -#include "../../../../src/platformsupport/linuxaccessibility/struct_marshallers_p.h" +#include "dbusconnection_p.h" +#include "struct_marshallers_p.h" #define COMPARE3(v1, v2, v3) QCOMPARE(v1, v3); QCOMPARE(v2, v3); |