diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 16:33:37 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 12:09:33 +0200 |
commit | 67afac53feda6b05edf7a17dd506d378500ba9ae (patch) | |
tree | aabef27f30acbb62c2d0b22e826e4b1cb29cd19a /tests/auto | |
parent | 092f23cdacb5dd0ad2307cd4c18546054f7f5245 (diff) |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I84f5fc4eb26f95d81ce5b5b8cc72706bb9185026
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto')
20 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/linguist/lconvert/CMakeLists.txt b/tests/auto/linguist/lconvert/CMakeLists.txt index 800dcb793..401d48fa0 100644 --- a/tests/auto/linguist/lconvert/CMakeLists.txt +++ b/tests/auto/linguist/lconvert/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_lconvert Test: ##################################################################### -qt_add_test(tst_lconvert +qt_internal_add_test(tst_lconvert SOURCES tst_lconvert.cpp ) diff --git a/tests/auto/linguist/lrelease/CMakeLists.txt b/tests/auto/linguist/lrelease/CMakeLists.txt index 6de654340..484109cf2 100644 --- a/tests/auto/linguist/lrelease/CMakeLists.txt +++ b/tests/auto/linguist/lrelease/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_lrelease Test: ##################################################################### -qt_add_test(tst_lrelease +qt_internal_add_test(tst_lrelease SOURCES tst_lrelease.cpp ) diff --git a/tests/auto/linguist/lupdate/.prev_CMakeLists.txt b/tests/auto/linguist/lupdate/.prev_CMakeLists.txt index 405663002..40692c01a 100644 --- a/tests/auto/linguist/lupdate/.prev_CMakeLists.txt +++ b/tests/auto/linguist/lupdate/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_lupdate Test: ##################################################################### -qt_add_test(tst_lupdate +qt_internal_add_test(tst_lupdate SOURCES tst_lupdate.cpp ) diff --git a/tests/auto/linguist/lupdate/CMakeLists.txt b/tests/auto/linguist/lupdate/CMakeLists.txt index 27c96e9f8..874a08b30 100644 --- a/tests/auto/linguist/lupdate/CMakeLists.txt +++ b/tests/auto/linguist/lupdate/CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_lupdate Test: ##################################################################### -qt_add_test(tst_lupdate +qt_internal_add_test(tst_lupdate SOURCES tst_lupdate.cpp ) diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt index 98eebb7d0..458214503 100644 --- a/tests/auto/qdoc/config/CMakeLists.txt +++ b/tests/auto/qdoc/config/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_config Test: ##################################################################### -qt_add_test(tst_config +qt_internal_add_test(tst_config SOURCES ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt index 7f0bda913..9437d7395 100644 --- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_generatedOutput Test: ##################################################################### -qt_add_test(tst_generatedOutput +qt_internal_add_test(tst_generatedOutput SOURCES tst_generatedoutput.cpp ) diff --git a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt index 68da67c5d..be9a1e538 100644 --- a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt +++ b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdoccommandlineparser Test: ##################################################################### -qt_add_test(tst_qdoccommandlineparser +qt_internal_add_test(tst_qdoccommandlineparser SOURCES ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h tst_qdoccommandlineparser.cpp @@ -17,7 +17,7 @@ set(tst_qdoccommandlineparser_resource_files "tst_arguments.txt" ) -qt_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser" +qt_internal_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser" PREFIX "/" FILES diff --git a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt index f3d75e501..46aed69a5 100644 --- a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt +++ b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdoccommandlineparser Test: ##################################################################### -qt_add_test(tst_qdoccommandlineparser +qt_internal_add_test(tst_qdoccommandlineparser WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" # special case SOURCES ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h @@ -18,7 +18,7 @@ set(tst_qdoccommandlineparser_resource_files "tst_arguments.txt" ) -qt_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser" +qt_internal_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser" PREFIX "/" FILES diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt index d47700827..a424023f9 100644 --- a/tests/auto/qdoc/utilities/CMakeLists.txt +++ b/tests/auto/qdoc/utilities/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_utilities Test: ##################################################################### -qt_add_test(tst_utilities +qt_internal_add_test(tst_utilities SOURCES ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h tst_utilities.cpp diff --git a/tests/auto/qhelpcontentmodel/CMakeLists.txt b/tests/auto/qhelpcontentmodel/CMakeLists.txt index daef8c0b8..920ac2ca2 100644 --- a/tests/auto/qhelpcontentmodel/CMakeLists.txt +++ b/tests/auto/qhelpcontentmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhelpcontentmodel Test: ##################################################################### -qt_add_test(tst_qhelpcontentmodel +qt_internal_add_test(tst_qhelpcontentmodel SOURCES tst_qhelpcontentmodel.cpp DEFINES diff --git a/tests/auto/qhelpenginecore/CMakeLists.txt b/tests/auto/qhelpenginecore/CMakeLists.txt index e31f8b10b..548f2068c 100644 --- a/tests/auto/qhelpenginecore/CMakeLists.txt +++ b/tests/auto/qhelpenginecore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhelpenginecore Test: ##################################################################### -qt_add_test(tst_qhelpenginecore +qt_internal_add_test(tst_qhelpenginecore SOURCES tst_qhelpenginecore.cpp DEFINES diff --git a/tests/auto/qhelpgenerator/CMakeLists.txt b/tests/auto/qhelpgenerator/CMakeLists.txt index 40ed0bec3..609c20e59 100644 --- a/tests/auto/qhelpgenerator/CMakeLists.txt +++ b/tests/auto/qhelpgenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhelpgenerator Test: ##################################################################### -qt_add_test(tst_qhelpgenerator +qt_internal_add_test(tst_qhelpgenerator SOURCES ../../../src/assistant/qhelpgenerator/helpgenerator.cpp ../../../src/assistant/qhelpgenerator/helpgenerator.h ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h diff --git a/tests/auto/qhelpindexmodel/CMakeLists.txt b/tests/auto/qhelpindexmodel/CMakeLists.txt index 6357488a6..10061d84f 100644 --- a/tests/auto/qhelpindexmodel/CMakeLists.txt +++ b/tests/auto/qhelpindexmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhelpindexmodel Test: ##################################################################### -qt_add_test(tst_qhelpindexmodel +qt_internal_add_test(tst_qhelpindexmodel SOURCES tst_qhelpindexmodel.cpp DEFINES diff --git a/tests/auto/qhelpprojectdata/CMakeLists.txt b/tests/auto/qhelpprojectdata/CMakeLists.txt index 1d140b287..d48ae592f 100644 --- a/tests/auto/qhelpprojectdata/CMakeLists.txt +++ b/tests/auto/qhelpprojectdata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhelpprojectdata Test: ##################################################################### -qt_add_test(tst_qhelpprojectdata +qt_internal_add_test(tst_qhelpprojectdata SOURCES ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h ../../../src/assistant/qhelpgenerator/qhelpprojectdata.cpp ../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h diff --git a/tests/auto/qtattributionsscanner/CMakeLists.txt b/tests/auto/qtattributionsscanner/CMakeLists.txt index c76353323..24d512afe 100644 --- a/tests/auto/qtattributionsscanner/CMakeLists.txt +++ b/tests/auto/qtattributionsscanner/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtattributionsscanner Test: ##################################################################### -qt_add_test(tst_qtattributionsscanner +qt_internal_add_test(tst_qtattributionsscanner SOURCES tst_qtattributionsscanner.cpp ) diff --git a/tests/auto/qtdiag/CMakeLists.txt b/tests/auto/qtdiag/CMakeLists.txt index 0c6ce3698..a796f606f 100644 --- a/tests/auto/qtdiag/CMakeLists.txt +++ b/tests/auto/qtdiag/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_tdiag Test: ##################################################################### -qt_add_test(tst_tdiag +qt_internal_add_test(tst_tdiag SOURCES tst_qtdiag.cpp DEFINES diff --git a/tests/auto/windeployqt/test/.prev_CMakeLists.txt b/tests/auto/windeployqt/test/.prev_CMakeLists.txt index 53de8926d..6f5ede1b3 100644 --- a/tests/auto/windeployqt/test/.prev_CMakeLists.txt +++ b/tests/auto/windeployqt/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_windeployqt Test: ##################################################################### -qt_add_test(tst_windeployqt +qt_internal_add_test(tst_windeployqt OUTPUT_DIRECTORY ".." SOURCES ../tst_windeployqt.cpp diff --git a/tests/auto/windeployqt/test/CMakeLists.txt b/tests/auto/windeployqt/test/CMakeLists.txt index 1c9a9ca41..d412249a7 100644 --- a/tests/auto/windeployqt/test/CMakeLists.txt +++ b/tests/auto/windeployqt/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_windeployqt Test: ##################################################################### -qt_add_test(tst_windeployqt +qt_internal_add_test(tst_windeployqt OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_windeployqt.cpp diff --git a/tests/auto/windeployqt/testapp/.prev_CMakeLists.txt b/tests/auto/windeployqt/testapp/.prev_CMakeLists.txt index 6c9b9c79b..d5cbcad91 100644 --- a/tests/auto/windeployqt/testapp/.prev_CMakeLists.txt +++ b/tests/auto/windeployqt/testapp/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testapp Binary: ##################################################################### -qt_add_executable(testapp +qt_internal_add_executable(testapp GUI OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/windeployqt/testapp/CMakeLists.txt b/tests/auto/windeployqt/testapp/CMakeLists.txt index bb8127633..83851dae6 100644 --- a/tests/auto/windeployqt/testapp/CMakeLists.txt +++ b/tests/auto/windeployqt/testapp/CMakeLists.txt @@ -4,7 +4,7 @@ ## testapp Binary: ##################################################################### -qt_add_executable(windeploy_testapp # special case +qt_internal_add_executable(windeploy_testapp # special case GUI OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES |