diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-01-05 14:00:15 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-01-14 14:21:45 +0100 |
| commit | a2db96e253856aaabe10fe3bad6409dd047533a5 (patch) | |
| tree | 0006e93cecafecce5b3aa9657b32ce6434faa0d6 /tests/auto/gui/kernel | |
| parent | 92ed274475baff60c183afb4a8b3f90d04e37905 (diff) | |
Skip tst_qhighdpi when offscreen is not built
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ø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/gui/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qhighdpi/BLACKLIST | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt index e19ee9a75c..7ff4e40280 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 02ccbe2e40..0000000000 --- a/tests/auto/gui/kernel/qhighdpi/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-88505 -[qhighdpiscaling:96] -android |