Fix building tests with -no-gui

Change-Id: I37307080e5adc334fcfcdd2fee650d675228a746
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Jüri Valdmann 2018-10-19 12:39:12 +02:00
parent 10b8ed816d
commit cea2b5510c
4 changed files with 10 additions and 8 deletions

View File

@ -48,8 +48,8 @@ for (dep, dependentmodules): \
dependentmodules = $$join(mod_deps, ";")
QT_FOR_CONFIG += gui-private
qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True
!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True
qtHaveModule(gui):qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True
qtHaveModule(gui):!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True
CMAKE_MODULE_VERSIONS =
CMAKE_MODULES_UNDER_TEST =

View File

@ -1,9 +1,9 @@
TEMPLATE=subdirs
SUBDIRS = qabstractitemmodel \
qstringlistmodel \
SUBDIRS = qstringlistmodel
qtHaveModule(gui): SUBDIRS += \
qabstractitemmodel \
qabstractproxymodel \
qidentityproxymodel \
qitemselectionmodel \

View File

@ -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

View File

@ -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