diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-08 14:21:44 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-12 10:06:33 +0000 |
| commit | 8f1a401c7a52038008b1807b65f599021b9545f8 (patch) | |
| tree | 99c8836f09f73f6d8ef004ce05a8668a2580e9f6 /tests | |
| parent | 8929ce3fc2faca9785d9ab2ab77acd6c683865a5 (diff) | |
Remove support for GPU_BLACKLIST files from some tests
The feature is no longer used and support for it shall soon be dropped.
Change-Id: I9b35b43262b6f07609cf931315125e91e0a1f9b6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/default/tst_default.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/fusion/tst_fusion.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/imagine/tst_imagine.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/material/tst_material.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/universal/tst_universal.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/shared/qtest_quickcontrols.h | 4 |
6 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/controls/default/tst_default.cpp b/tests/auto/controls/default/tst_default.cpp index d21f13ad..4c575ce6 100644 --- a/tests/auto/controls/default/tst_default.cpp +++ b/tests/auto/controls/default/tst_default.cpp @@ -38,7 +38,6 @@ int main(int argc, char *argv[]) { - QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); return quick_test_main(argc, argv, "tst_controls::Default", TST_CONTROLS_DATA); diff --git a/tests/auto/controls/fusion/tst_fusion.cpp b/tests/auto/controls/fusion/tst_fusion.cpp index 84f9c231..7528ccea 100644 --- a/tests/auto/controls/fusion/tst_fusion.cpp +++ b/tests/auto/controls/fusion/tst_fusion.cpp @@ -39,7 +39,6 @@ int main(int argc, char *argv[]) { - QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); QQuickStyle::setStyle("Fusion"); diff --git a/tests/auto/controls/imagine/tst_imagine.cpp b/tests/auto/controls/imagine/tst_imagine.cpp index 9777c9c9..9db7ed4d 100644 --- a/tests/auto/controls/imagine/tst_imagine.cpp +++ b/tests/auto/controls/imagine/tst_imagine.cpp @@ -39,7 +39,6 @@ int main(int argc, char *argv[]) { - QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); QQuickStyle::setStyle("Imagine"); diff --git a/tests/auto/controls/material/tst_material.cpp b/tests/auto/controls/material/tst_material.cpp index 7d1953c2..ae8bb3a1 100644 --- a/tests/auto/controls/material/tst_material.cpp +++ b/tests/auto/controls/material/tst_material.cpp @@ -39,7 +39,6 @@ int main(int argc, char *argv[]) { - QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); QQuickStyle::setStyle("Material"); diff --git a/tests/auto/controls/universal/tst_universal.cpp b/tests/auto/controls/universal/tst_universal.cpp index d293dc4c..db5b560e 100644 --- a/tests/auto/controls/universal/tst_universal.cpp +++ b/tests/auto/controls/universal/tst_universal.cpp @@ -39,7 +39,6 @@ int main(int argc, char *argv[]) { - QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); QQuickStyle::setStyle("Universal"); diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h index d1fe08f6..1c803ae2 100644 --- a/tests/auto/shared/qtest_quickcontrols.h +++ b/tests/auto/shared/qtest_quickcontrols.h @@ -69,15 +69,11 @@ static int runTests(QObject *testObject, int argc, char *argv[]) } #define QTEST_QUICKCONTROLS_MAIN(TestCase) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ int main(int argc, char *argv[]) \ { \ qputenv("QML_NO_TOUCH_COMPRESSION", "1"); \ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); \ QGuiApplication app(argc, argv); \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestCase tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return runTests(&tc, argc, argv); \ |