From 358a9ac9362917e644e4c09c8d5c85d13faf5503 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sun, 7 Sep 2014 08:48:29 +0200 Subject: [PATCH] Do not include accessibility.pri twice Change-Id: Id4b312a57b098ad893ba08e7a3c7f1a0fb891eef Reviewed-by: Friedemann Kleint --- src/platformsupport/linuxaccessibility/linuxaccessibility.pri | 1 - tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri index 1d51d2876c6..1b65fb1cad6 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri +++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri @@ -2,7 +2,6 @@ contains(QT_CONFIG, accessibility-atspi-bridge) { QT_FOR_PRIVATE += dbus include(../../3rdparty/atspi2/atspi2.pri) - include(../accessibility/accessibility.pri) INCLUDEPATH += $$PWD diff --git a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro index cb5bc04c1d7..2ea54ab6032 100644 --- a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro +++ b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro @@ -3,6 +3,7 @@ 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/accessibility/accessibility.pri) include($$QT_SOURCE_TREE/src/platformsupport/linuxaccessibility/linuxaccessibility.pri) TARGET = tst_qaccessibilitylinux