diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
| commit | 1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (patch) | |
| tree | 25f46dc18d8f8430d46ad365452ce0d8a7c9d9d0 /sources/pyside2/tests/pysidetest/CMakeLists.txt | |
| parent | ad14f64972d182fca3e180c08750ca020a91b84e (diff) | |
| parent | 2490c34325bb1b39922582090a4cb69c01726999 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206
Diffstat (limited to 'sources/pyside2/tests/pysidetest/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 0a367e8a5..9db55e524 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -121,7 +121,10 @@ target_link_libraries(testbinding add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets pysidetest) PYSIDE_TEST(decoratedslot_test.py) -PYSIDE_TEST(delegatecreateseditor_test.py) +# Will always crash when built against Qt 5.6, no point in running it. +if (Qt5Core_VERSION VERSION_GREATER 5.7.0) + PYSIDE_TEST(delegatecreateseditor_test.py) +endif() PYSIDE_TEST(enum_test.py) PYSIDE_TEST(homonymoussignalandmethod_test.py) PYSIDE_TEST(list_signal_test.py) @@ -139,5 +142,4 @@ PYSIDE_TEST(utils_test.py) PYSIDE_TEST(mixin_signal_slots_test.py) PYSIDE_TEST(signal_slot_warning.py) PYSIDE_TEST(all_modules_load_test.py) -PYSIDE_TEST(signature_test.py) PYSIDE_TEST(qapp_like_a_macro_test.py) |