diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:14 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:14 +0100 |
commit | a317bff2985b0bd70a8b7685249137df4cc17c5d (patch) | |
tree | 2d2945305ff5edc263174d2bdb266833c5728a68 /tests/auto/other | |
parent | b56e856d218976bf39d981468267337d8d6223f5 (diff) | |
parent | d05ca484cfef805f3b442ad29e50d5f219049336 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib4df563fc7b1f7c40f425e0e71180d9517a672be
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/other.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 4206852e4c..743de1e188 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -68,7 +68,4 @@ winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility android: SUBDIRS += \ android -qtConfig(xkbcommon): { - SUBDIRS += \ - xkbkeyboard -} +qtHaveModule(gui):qtConfig(xkbcommon): SUBDIRS += xkbkeyboard |