From a2db96e253856aaabe10fe3bad6409dd047533a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 5 Jan 2021 14:00:15 +0100 Subject: [PATCH] Skip tst_qhighdpi when offscreen is not built MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android and Wasm do not build the offscreen platform plugin (see src/plugins/platforms/CMakeLists.txt). Skip building the tst_qhighdpi test as well in this case. Remove the BLACKLIST entry. Task-number: QTBUG-88505 Change-Id: I172198c8c24759b14f73ad07260c449fc6ab893f Reviewed-by: Tor Arne Vestbø --- tests/auto/gui/kernel/CMakeLists.txt | 4 +++- tests/auto/gui/kernel/qhighdpi/BLACKLIST | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 tests/auto/gui/kernel/qhighdpi/BLACKLIST diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt index e19ee9a75cb..7ff4e402802 100644 --- a/tests/auto/gui/kernel/CMakeLists.txt +++ b/tests/auto/gui/kernel/CMakeLists.txt @@ -11,7 +11,9 @@ add_subdirectory(qevent) add_subdirectory(qfileopenevent) add_subdirectory(qguieventdispatcher) add_subdirectory(qguitimer) -add_subdirectory(qhighdpi) +if(NOT ANDROID AND NOT WASM) + add_subdirectory(qhighdpi) +endif() add_subdirectory(qinputdevice) add_subdirectory(qinputmethod) add_subdirectory(qkeyevent) diff --git a/tests/auto/gui/kernel/qhighdpi/BLACKLIST b/tests/auto/gui/kernel/qhighdpi/BLACKLIST deleted file mode 100644 index 02ccbe2e40a..00000000000 --- a/tests/auto/gui/kernel/qhighdpi/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-88505 -[qhighdpiscaling:96] -android