diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /tests/auto/corelib/thread | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread')
3 files changed, 15 insertions, 3 deletions
diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 0cfea773b1..14b7a73e6f 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qfuture tst_qfuture.cpp DEFINES -QT_NO_JAVA_STYLE_ITERATORS - QT_STRICT_ITERATORS LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt index 7fa65a6859..de295bc129 100644 --- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qresultstore SOURCES tst_qresultstore.cpp - DEFINES - QT_STRICT_ITERATORS LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt new file mode 100644 index 0000000000..87ae29a04c --- /dev/null +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from crashonexit.pro. + +##################################################################### +## crashonexit Binary: +##################################################################### + +add_qt_executable(crashonexit + OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" + SOURCES + crashOnExit.cpp +) + +## Scopes: +##################################################################### |