From 490ee4c5e6d296d975980c8be65d9b6f661d2603 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Thu, 18 Oct 2018 15:25:14 +0200
Subject: [PATCH] Fix compilation of tst_qaccessibilitylinux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Note that the test is still disabled, but this is needed in any case.

Change-Id: Ib7523ba800b94c32690c1bd09b23fc2078c71d4e
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 .../auto/other/qaccessibilitylinux/qaccessibilitylinux.pro | 1 +
 .../other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp  | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro
index 5cb3f5902a6..a964df0e244 100644
--- a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro
+++ b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro
@@ -5,3 +5,4 @@ SOURCES += tst_qaccessibilitylinux.cpp
 
 QT += gui-private widgets dbus testlib accessibility_support-private linuxaccessibility_support-private
 
+DBUS_INTERFACES = $$PWD/../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
diff --git a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
index 2b82b039981..7ba3715e130 100644
--- a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
+++ b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
@@ -42,12 +42,11 @@
 #include <QDBusInterface>
 #include <QDBusReply>
 
-#include "atspi/atspi-constants.h"
+#include <atspi/atspi-constants.h>
+#include <private/dbusconnection_p.h>
+#include <private/struct_marshallers_p.h>
 #include "bus_interface.h"
 
-#include "dbusconnection_p.h"
-#include "struct_marshallers_p.h"
-
 #define COMPARE3(v1, v2, v3) QCOMPARE(v1, v3); QCOMPARE(v2, v3);
 
 class AccessibleTestWindow : public QWidget