summaryrefslogtreecommitdiff
path: root/tests/auto/qml
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-06-26 10:01:16 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-07-19 10:30:21 +0000
commitb73b3f8a5cb566ff8219b14647f0ceae29cfe6b2 (patch)
treee3603e34407807c0e8053478c8e42cde3deb5fd4 /tests/auto/qml
parent191dd6e89fdca2108cfaf405e968a980ec6728ee (diff)
downloadqtwebsockets-b73b3f8a5cb566ff8219b14647f0ceae29cfe6b2.tar.gz
Enable tests for boot2qt
Websocket tests for boot2qt were disabled with commit 1a75da8d514c90cf1af250ba3eaa764df4838775. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Qemu still has missing syscall support so some tests need to be skipped if that condition is detected. Change-Id: I39dba91cb35cc17a9a9263c90a739cbf95efa582 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r--tests/auto/qml/qml.pro3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 2d2fde4..8951c55 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -1,6 +1,3 @@
TEMPLATE = subdirs
!uikit: SUBDIRS += qmlwebsockets qmlwebsockets_compat
-
-# QTBUG-60268
-boot2qt: SUBDIRS -= qmlwebsockets_compat