summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-02 15:04:17 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-02 13:09:49 +0000
commit8264d5be23f5d35063e334c4b28c4efb4a43fa17 (patch)
treeb5cb020aa9f29a514a2921e3cf19dd34547b1fd5
parentbbd67125242fd270890749c0c7c0bf0abe9418b9 (diff)
downloadqtquickcontrols-8264d5be23f5d35063e334c4b28c4efb4a43fa17.tar.gz
Remove CONFIG += parallel_test.
The keyword no longer has a meaning for the new CI. Change-Id: Ia9b92873afde00d2d0a352856f4a531f419b6e85 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--tests/auto/customcontrolsstyle/customcontrolsstyle.pro1
-rw-r--r--tests/auto/dialogs/dialogs.pro1
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/customcontrolsstyle/customcontrolsstyle.pro b/tests/auto/customcontrolsstyle/customcontrolsstyle.pro
index d3bcae47..ab50791e 100644
--- a/tests/auto/customcontrolsstyle/customcontrolsstyle.pro
+++ b/tests/auto/customcontrolsstyle/customcontrolsstyle.pro
@@ -6,7 +6,6 @@ include (../shared/util.pri)
osx:CONFIG -= app_bundle
-CONFIG += parallel_test
QT += core-private qml-private quick-private testlib
TESTDATA = data/*
diff --git a/tests/auto/dialogs/dialogs.pro b/tests/auto/dialogs/dialogs.pro
index 945c01c4..646c473b 100644
--- a/tests/auto/dialogs/dialogs.pro
+++ b/tests/auto/dialogs/dialogs.pro
@@ -9,7 +9,6 @@ osx:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
win32:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
-CONFIG += parallel_test
QT += core-private gui-private qml-private quick-private testlib
TESTDATA = data/*