From a298fa3786148b843ed1023e4f50e94fc3526136 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 16 May 2018 08:35:36 +0200 Subject: winrt: Skip/blacklist failing opengl tests Task-number: QTBUG-68297 Change-Id: I1396b658b49baf5a8d4b97e35c22ddc25727b68a Reviewed-by: Maurice Kalinowski --- tests/auto/auto.pro | 2 +- tests/auto/gui/gui.pro | 2 +- tests/auto/widgets/widgets/widgets.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index fbd89e4045..a830525d04 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -23,7 +23,7 @@ uikit: SUBDIRS = corelib gui cross_compile: SUBDIRS -= tools cmake installed_cmake else:!qtConfig(process): SUBDIRS -= tools -!qtHaveModule(opengl): SUBDIRS -= opengl +winrt|!qtHaveModule(opengl): SUBDIRS -= opengl !qtHaveModule(gui): SUBDIRS -= gui !qtHaveModule(widgets): SUBDIRS -= widgets !qtHaveModule(printsupport): SUBDIRS -= printsupport diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index d7cda11513..e0c8123f26 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -14,6 +14,6 @@ SUBDIRS = \ util \ itemmodels \ -!qtConfig(opengl): SUBDIRS -= qopengl qopenglconfig +!qtConfig(opengl)|winrt: SUBDIRS -= qopengl qopenglconfig !qtConfig(vulkan): SUBDIRS -= qvulkan diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro index c098108edc..c6325aac15 100644 --- a/tests/auto/widgets/widgets/widgets.pro +++ b/tests/auto/widgets/widgets/widgets.pro @@ -55,4 +55,4 @@ SUBDIRS=\ qtextedit \ qtoolbar \ -qtConfig(opengl): SUBDIRS += qopenglwidget +!winrt:qtConfig(opengl): SUBDIRS += qopenglwidget -- cgit v1.2.3