aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-08-19 00:42:59 -0700
committerJake Petroules <jake.petroules@qt.io>2016-08-19 21:04:31 +0000
commit25c2cfc143ffbee16acea55394c0d8752beb31ea (patch)
tree35f3abdbc1e6585085bd6432d57f492060d14e44 /tests
parentf36f3d0b4bd51985d64ab1a5f38313279bd1b00e (diff)
Exclude tests that require features not present on UIKit platforms
Change-Id: I0398bf60fa150e9e03822938a2a6bedf280d7750 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/auto/qml/qml.pro5
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7b13cb2b6d..556f5ddc7a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -14,6 +14,9 @@ qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
}
+# console applications not supported
+uikit: SUBDIRS -= qmltest
+
qmldevtools.CONFIG = host_build
installed_cmake.depends = cmake
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index fae1b6f58b..68a2eace19 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -8,7 +8,6 @@ PUBLICTESTS += \
qjsvalueiterator \
qjsonbinding \
qmlmin \
- qmlplugindump \
qqmlcomponent \
qqmlconsole \
qqmlengine \
@@ -74,9 +73,9 @@ qtHaveModule(widgets) {
SUBDIRS += $$PUBLICTESTS \
qqmlextensionplugin
SUBDIRS += $$METATYPETESTS
-!winrt { # no QProcess on winrt
+!uikit:!winrt { # no QProcess on uikit/winrt
!contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
- SUBDIRS += qmllint
+ SUBDIRS += qmllint qmlplugindump
}
qtConfig(private_tests): \