diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-07 08:48:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-21 20:38:22 +0100 |
| commit | 358a9ac9362917e644e4c09c8d5c85d13faf5503 (patch) | |
| tree | 1defb1aaf8f94f7bbeb7880967cae9efe2f4d62f | |
| parent | 0eaa86dd018294d1a961f486bf290f8647293c6d (diff) | |
Do not include accessibility.pri twice
Change-Id: Id4b312a57b098ad893ba08e7a3c7f1a0fb891eef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/platformsupport/linuxaccessibility/linuxaccessibility.pri | 1 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri index 1d51d2876c..1b65fb1cad 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 cb5bc04c1d..2ea54ab603 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 |