From cea2b5510c28d1057018007d65589fecee62b0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Fri, 19 Oct 2018 12:39:12 +0200
Subject: Fix building tests with -no-gui

Change-Id: I37307080e5adc334fcfcdd2fee650d675228a746
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 tests/auto/corelib/itemmodels/itemmodels.pro | 4 ++--
 tests/auto/other/other.pro                   | 4 ++--
 tests/auto/testlib/selftests/selftests.pri   | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro
index bcb6e604f8..cca350ad43 100644
--- a/tests/auto/corelib/itemmodels/itemmodels.pro
+++ b/tests/auto/corelib/itemmodels/itemmodels.pro
@@ -1,9 +1,9 @@
 TEMPLATE=subdirs
 
-SUBDIRS = qabstractitemmodel \
-    qstringlistmodel \
+SUBDIRS = qstringlistmodel
 
 qtHaveModule(gui): SUBDIRS += \
+    qabstractitemmodel \
     qabstractproxymodel \
     qidentityproxymodel \
     qitemselectionmodel \
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 61a464356c..d70c895dec 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -48,9 +48,9 @@ cross_compile: SUBDIRS -= \
    atwrapper \
    compiler
 
-winrt|!qtConfig(accessibility): SUBDIRS -= qaccessibility
+winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility
 
-!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
+!qtHaveModule(gui)|!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
 
 !qtConfig(process): SUBDIRS -= qprocess_and_guieventloop
 
diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri
index 498d1653c0..05ed6d9905 100644
--- a/tests/auto/testlib/selftests/selftests.pri
+++ b/tests/auto/testlib/selftests/selftests.pri
@@ -27,10 +27,8 @@ SUBPROGRAMS = \
      findtestdata \
      float \
      globaldata \
-     keyboard \
      longstring \
      maxwarnings \
-     mouse \
      multiexec \
      pairdiagnostics \
      printdatatags \
@@ -52,5 +50,9 @@ SUBPROGRAMS = \
      warnings \
      xunit
 
+qtHaveModule(gui): SUBPROGRAMS += \
+    keyboard \
+    mouse
+
 INCLUDEPATH += ../../../../shared/
 HEADERS += ../../../../shared/emulationdetector.h
-- 
cgit v1.2.3