From 8076afb3c62c96d30dc1e0f74bea51f1a7e81164 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 13:25:40 +0100 Subject: [PATCH] Regenerate tests/auto/corelib/tools Change-Id: I1ea8fbf509c7e6d556ebd974fcff9084bc668e17 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- .../auto/corelib/tools/qalgorithms/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qarraydata/CMakeLists.txt | 11 +++++++++-- tests/auto/corelib/tools/qbitarray/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qcache/CMakeLists.txt | 11 ++++++++++- .../qcommandlineparser/testhelper/CMakeLists.txt | 13 ++----------- .../corelib/tools/qcontiguouscache/CMakeLists.txt | 11 ++++++++++- .../auto/corelib/tools/qeasingcurve/CMakeLists.txt | 11 ++++++++++- .../qexplicitlyshareddatapointer/CMakeLists.txt | 11 ++++++++++- .../auto/corelib/tools/qhash/.prev_CMakeLists.txt | 12 ++++++++++++ tests/auto/corelib/tools/qhash/CMakeLists.txt | 13 ++++++++++++- .../corelib/tools/qhashfunctions/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qmakearray/CMakeLists.txt | 13 ++++++++++++- tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt | 12 ++++++++++++ tests/auto/corelib/tools/qmap/CMakeLists.txt | 13 ++++++++++++- tests/auto/corelib/tools/qmargins/CMakeLists.txt | 11 ++++++++++- .../qmessageauthenticationcode/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qpair/CMakeLists.txt | 14 +++++++++++++- tests/auto/corelib/tools/qpoint/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qpointf/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qqueue/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qrect/CMakeLists.txt | 11 ++++++++++- .../auto/corelib/tools/qringbuffer/CMakeLists.txt | 13 ++++++++++++- .../corelib/tools/qscopedpointer/CMakeLists.txt | 11 ++++++++++- .../tools/qscopedvaluerollback/CMakeLists.txt | 11 ++++++++++- .../auto/corelib/tools/qscopeguard/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qsize/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qsizef/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qstl/CMakeLists.txt | 11 ++++++++++- tests/auto/corelib/tools/qtimeline/CMakeLists.txt | 11 ++++++++++- 29 files changed, 296 insertions(+), 38 deletions(-) create mode 100644 tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt create mode 100644 tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt index 66c205b605e..14b7c95f4b0 100644 --- a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt +++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qalgorithms SOURCES tst_qalgorithms.cpp) +# Generated from qalgorithms.pro. + +##################################################################### +## tst_qalgorithms Test: +##################################################################### + +add_qt_test(tst_qalgorithms + SOURCES + tst_qalgorithms.cpp +) diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt index 573f13af55c..f68c3714aa8 100644 --- a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt +++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt @@ -1,4 +1,11 @@ -add_qt_test(tst_qarraydata SOURCES - tst_qarraydata.cpp +# Generated from qarraydata.pro. + +##################################################################### +## tst_qarraydata Test: +##################################################################### + +add_qt_test(tst_qarraydata + SOURCES simplevector.h + tst_qarraydata.cpp ) diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt index 684fa58694e..65150c02a2c 100644 --- a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qbitarray SOURCES tst_qbitarray.cpp) +# Generated from qbitarray.pro. + +##################################################################### +## tst_qbitarray Test: +##################################################################### + +add_qt_test(tst_qbitarray + SOURCES + tst_qbitarray.cpp +) diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt index 816614bebff..50fb2372c32 100644 --- a/tests/auto/corelib/tools/qcache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qcache SOURCES tst_qcache.cpp) +# Generated from qcache.pro. + +##################################################################### +## tst_qcache Test: +##################################################################### + +add_qt_test(tst_qcache + SOURCES + tst_qcache.cpp +) diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt index d93193ac646..3d0989d841d 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt @@ -4,17 +4,8 @@ ## qcommandlineparser_test_helper Binary: ##################################################################### -# special case -add_qt_test_helper(qcommandlineparser_test_helper +add_qt_executable(qcommandlineparser_test_helper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qcommandlineparser_test_helper.cpp ) - -# special case -set_target_properties(qcommandlineparser_test_helper PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - - -#### Keys ignored in scope 1:tests/auto/corelib/tools/qcommandlineparser/testhelper:tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.pro:: -# CONFIG = "console" "-app_bundle" -# DESTDIR = "./" diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt index 3f7dc63c5b9..bce8ce11bd3 100644 --- a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qcontiguouscache SOURCES tst_qcontiguouscache.cpp) +# Generated from qcontiguouscache.pro. + +##################################################################### +## tst_qcontiguouscache Test: +##################################################################### + +add_qt_test(tst_qcontiguouscache + SOURCES + tst_qcontiguouscache.cpp +) diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt index 42bfd081af9..c2611921abc 100644 --- a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt +++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qeasingcurve SOURCES tst_qeasingcurve.cpp) +# Generated from qeasingcurve.pro. + +##################################################################### +## tst_qeasingcurve Test: +##################################################################### + +add_qt_test(tst_qeasingcurve + SOURCES + tst_qeasingcurve.cpp +) diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt index 5da0db0398d..cacc36beaa4 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qexplicitlyshareddatapointer SOURCES tst_qexplicitlyshareddatapointer.cpp) +# Generated from qexplicitlyshareddatapointer.pro. + +##################################################################### +## tst_qexplicitlyshareddatapointer Test: +##################################################################### + +add_qt_test(tst_qexplicitlyshareddatapointer + SOURCES + tst_qexplicitlyshareddatapointer.cpp +) diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt new file mode 100644 index 00000000000..5dfeedb3223 --- /dev/null +++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qhash.pro. + +##################################################################### +## tst_qhash Test: +##################################################################### + +add_qt_test(tst_qhash + SOURCES + tst_qhash.cpp + DEFINES + -QT_NO_JAVA_STYLE_ITERATORS +) diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt index 1e0026e5bae..32edf720733 100644 --- a/tests/auto/corelib/tools/qhash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qhash SOURCES tst_qhash.cpp) +# Generated from qhash.pro. + +##################################################################### +## tst_qhash Test: +##################################################################### + +add_qt_test(tst_qhash + SOURCES + tst_qhash.cpp + DEFINES + #-QT_NO_JAVA_STYLE_ITERATORS # special case remove +) diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt index 2a9b50e70e6..87d109f9975 100644 --- a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qhashfunctions SOURCES tst_qhashfunctions.cpp) +# Generated from qhashfunctions.pro. + +##################################################################### +## tst_qhashfunctions Test: +##################################################################### + +add_qt_test(tst_qhashfunctions + SOURCES + tst_qhashfunctions.cpp +) diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt index f63961fe146..ce7b0d0afbf 100644 --- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qmakearray SOURCES tst_qmakearray.cpp LIBRARIES Qt::CorePrivate) +# Generated from qmakearray.pro. + +##################################################################### +## tst_qmakearray Test: +##################################################################### + +add_qt_test(tst_qmakearray + SOURCES + tst_qmakearray.cpp + LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt new file mode 100644 index 00000000000..96378d32789 --- /dev/null +++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qmap.pro. + +##################################################################### +## tst_qmap Test: +##################################################################### + +add_qt_test(tst_qmap + SOURCES + tst_qmap.cpp + DEFINES + -QT_NO_JAVA_STYLE_ITERATORS +) diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt index a53b522bd84..677159ae0d6 100644 --- a/tests/auto/corelib/tools/qmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qmap SOURCES tst_qmap.cpp) +# Generated from qmap.pro. + +##################################################################### +## tst_qmap Test: +##################################################################### + +add_qt_test(tst_qmap + SOURCES + tst_qmap.cpp + DEFINES + #-QT_NO_JAVA_STYLE_ITERATORS # special case remove +) diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt index 7bfb2d01f24..632e5dc8d2a 100644 --- a/tests/auto/corelib/tools/qmargins/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qmargins SOURCES tst_qmargins.cpp) +# Generated from qmargins.pro. + +##################################################################### +## tst_qmargins Test: +##################################################################### + +add_qt_test(tst_qmargins + SOURCES + tst_qmargins.cpp +) diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt index 1c851386079..6e142facfb8 100644 --- a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qmessageauthenticationcode SOURCES tst_qmessageauthenticationcode.cpp) +# Generated from qmessageauthenticationcode.pro. + +##################################################################### +## tst_qmessageauthenticationcode Test: +##################################################################### + +add_qt_test(tst_qmessageauthenticationcode + SOURCES + tst_qmessageauthenticationcode.cpp +) diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt index e8a0c8e855f..4c226f5a02d 100644 --- a/tests/auto/corelib/tools/qpair/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test(tst_qpair SOURCES tst_qpair.cpp) +# Generated from qpair.pro. + +##################################################################### +## tst_qpair Test: +##################################################################### + +add_qt_test(tst_qpair + SOURCES + tst_qpair.cpp +) + +## Scopes: +##################################################################### diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt index 869ddab1c7b..6ef68c30cb0 100644 --- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qpoint SOURCES tst_qpoint.cpp) +# Generated from qpoint.pro. + +##################################################################### +## tst_qpoint Test: +##################################################################### + +add_qt_test(tst_qpoint + SOURCES + tst_qpoint.cpp +) diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt index d0cfc0c8edb..b1784d999f3 100644 --- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qpointf SOURCES tst_qpointf.cpp) +# Generated from qpointf.pro. + +##################################################################### +## tst_qpointf Test: +##################################################################### + +add_qt_test(tst_qpointf + SOURCES + tst_qpointf.cpp +) diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt index 4e8a711fd9c..6d1aeda5b2c 100644 --- a/tests/auto/corelib/tools/qqueue/CMakeLists.txt +++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qqueue SOURCES tst_qqueue.cpp) +# Generated from qqueue.pro. + +##################################################################### +## tst_qqueue Test: +##################################################################### + +add_qt_test(tst_qqueue + SOURCES + tst_qqueue.cpp +) diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt index 3ffa3d1d34a..47b8aced466 100644 --- a/tests/auto/corelib/tools/qrect/CMakeLists.txt +++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qrect SOURCES tst_qrect.cpp) +# Generated from qrect.pro. + +##################################################################### +## tst_qrect Test: +##################################################################### + +add_qt_test(tst_qrect + SOURCES + tst_qrect.cpp +) diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt index ccb9a1b7b4a..f9eccf72ff6 100644 --- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qringbuffer SOURCES tst_qringbuffer.cpp LIBRARIES Qt::CorePrivate) +# Generated from qringbuffer.pro. + +##################################################################### +## tst_qringbuffer Test: +##################################################################### + +add_qt_test(tst_qringbuffer + SOURCES + tst_qringbuffer.cpp + LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt index 24cc66b34a3..141bab267b5 100644 --- a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qscopedpointer SOURCES tst_qscopedpointer.cpp) +# Generated from qscopedpointer.pro. + +##################################################################### +## tst_qscopedpointer Test: +##################################################################### + +add_qt_test(tst_qscopedpointer + SOURCES + tst_qscopedpointer.cpp +) diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt index e772f67fb47..e23a4d55f90 100644 --- a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qscopedvaluerollback SOURCES tst_qscopedvaluerollback.cpp) +# Generated from qscopedvaluerollback.pro. + +##################################################################### +## tst_qscopedvaluerollback Test: +##################################################################### + +add_qt_test(tst_qscopedvaluerollback + SOURCES + tst_qscopedvaluerollback.cpp +) diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt index dae2fd49ff3..243efdd0b23 100644 --- a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qscopeguard SOURCES tst_qscopeguard.cpp) +# Generated from qscopeguard.pro. + +##################################################################### +## tst_qscopeguard Test: +##################################################################### + +add_qt_test(tst_qscopeguard + SOURCES + tst_qscopeguard.cpp +) diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt index 595b5f4af88..f5169411800 100644 --- a/tests/auto/corelib/tools/qsize/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qsize SOURCES tst_qsize.cpp) +# Generated from qsize.pro. + +##################################################################### +## tst_qsize Test: +##################################################################### + +add_qt_test(tst_qsize + SOURCES + tst_qsize.cpp +) diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt index 05aa4ba8a7f..d767ca92d7b 100644 --- a/tests/auto/corelib/tools/qsizef/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qsizef SOURCES tst_qsizef.cpp) +# Generated from qsizef.pro. + +##################################################################### +## tst_qsizef Test: +##################################################################### + +add_qt_test(tst_qsizef + SOURCES + tst_qsizef.cpp +) diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt index 37a9529e8f7..975ddfe0b5c 100644 --- a/tests/auto/corelib/tools/qstl/CMakeLists.txt +++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qstl SOURCES tst_qstl.cpp) +# Generated from qstl.pro. + +##################################################################### +## tst_qstl Test: +##################################################################### + +add_qt_test(tst_qstl + SOURCES + tst_qstl.cpp +) diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt index b23f07e9b5e..802cd563057 100644 --- a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt +++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qtimeline SOURCES tst_qtimeline.cpp) +# Generated from qtimeline.pro. + +##################################################################### +## tst_qtimeline Test: +##################################################################### + +add_qt_test(tst_qtimeline + SOURCES + tst_qtimeline.cpp +)