aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-06-07 11:31:37 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-07-19 13:30:29 +0000
commit4e42bcc0bbbd161e623e86c4408388b1a154accb (patch)
treebbd2042cbd29a92dc950101c8dff9000f35a24a9 /tests
parentf36bdfabafb5cae85ee7883181e88b39de8af779 (diff)
Enable tests for boot2qt
The tests for boot2qt were disabled with commit 96c9211bdde4c170e2fdb2f14178247eb7d8366b. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Also blacklisted a test failing because of QTBUG-61279 Change-Id: I56bd5041b1ffbb150cdaab1f76638fd79041af06 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/inputpanel/BLACKLIST6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3a406734..6b71c159 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -6,5 +6,3 @@ SUBDIRS += \
layoutfilesystem \
layoutresources \
-# QTBUG-60268
-boot2qt: SUBDIRS = ""
diff --git a/tests/auto/inputpanel/BLACKLIST b/tests/auto/inputpanel/BLACKLIST
index e69de29b..b814578b 100644
--- a/tests/auto/inputpanel/BLACKLIST
+++ b/tests/auto/inputpanel/BLACKLIST
@@ -0,0 +1,6 @@
+# QTBUG-61279
+# Test fails if hunspell support is enabled in qtvirtualkeyboard
+# and hunspell-en-gb is installed to the system
+[tst_plugin::test_wclAutoCommitWordSetting:row 0]
+b2qt
+