diff options
author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-04-06 23:02:12 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-08 21:01:10 +0000 |
commit | 06cd70831129e35e4c4d732546c261522344a59b (patch) | |
tree | 8f62c1bdb28e80d1b5572bb86373c7276fde766d | |
parent | fed46903ae5e5566e34daf34126bb00224f1533e (diff) |
cmake: remove old test conditions
There were some special cases with tests incompatibilities
in old Qt version, which are not valid anymore.
Change-Id: I5787a1e749b14ed4f0fb463cbf9530496f5b182b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit d7bb5403ec4a77d39da68714b32608678bdb0e95)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | sources/pyside6/tests/QtCore/CMakeLists.txt | 5 | ||||
-rw-r--r-- | sources/pyside6/tests/pysidetest/CMakeLists.txt | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sources/pyside6/tests/QtCore/CMakeLists.txt b/sources/pyside6/tests/QtCore/CMakeLists.txt index f9044a1b6..bc3d28a7d 100644 --- a/sources/pyside6/tests/QtCore/CMakeLists.txt +++ b/sources/pyside6/tests/QtCore/CMakeLists.txt @@ -52,10 +52,7 @@ PYSIDE_TEST(qbytearray_concatenation_operator_test.py) PYSIDE_TEST(qbytearray_operator_iadd_test.py) PYSIDE_TEST(qbytearray_operator_test.py) PYSIDE_TEST(qbytearray_test.py) -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.14.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.14.0) - PYSIDE_TEST(qcalendar_test.py) -endif() +PYSIDE_TEST(qcalendar_test.py) PYSIDE_TEST(qcbor_test.py) PYSIDE_TEST(qcollator_test.py) PYSIDE_TEST(qcommandlineparser_test.py) diff --git a/sources/pyside6/tests/pysidetest/CMakeLists.txt b/sources/pyside6/tests/pysidetest/CMakeLists.txt index f80eff134..0495a1a4f 100644 --- a/sources/pyside6/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside6/tests/pysidetest/CMakeLists.txt @@ -144,10 +144,7 @@ create_generator_target(testbinding) PYSIDE_TEST(constructor_properties_test.py) PYSIDE_TEST(decoratedslot_test.py) -# Will always crash when built against Qt 5.6, no point in running it. -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.7.0) - PYSIDE_TEST(delegatecreateseditor_test.py) -endif() +PYSIDE_TEST(delegatecreateseditor_test.py) PYSIDE_TEST(all_modules_load_test.py) PYSIDE_TEST(bug_1016.py) PYSIDE_TEST(embedding_test.py) |