diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-21 20:38:30 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-22 21:12:42 +0200 |
commit | 559213087ded2f68867a081d8f64d16bfac5e6fd (patch) | |
tree | a26a6c2a04dc793d535e5010e5f62dc1f022bb30 /tests | |
parent | 054c07b2ac51d134edd6eef6f3897470978cd7e4 (diff) |
CMake: Disable usage of CMake API compatibility wrappers
Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable
in the project ensures we ported away from old API calls.
Task-number: QTBUG-86815
Change-Id: I657ce43f65def5a13ca14030215a8adc37690d20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
35 files changed, 37 insertions, 37 deletions
diff --git a/tests/auto/cpptest/q3daxis-category/CMakeLists.txt b/tests/auto/cpptest/q3daxis-category/CMakeLists.txt index ca408c4a..3bac4408 100644 --- a/tests/auto/cpptest/q3daxis-category/CMakeLists.txt +++ b/tests/auto/cpptest/q3daxis-category/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3daxis-category +qt_internal_add_test(q3daxis-category SOURCES tst_axis.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt b/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt index de67a9b7..1c5932d1 100644 --- a/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt +++ b/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3daxis-logvalue +qt_internal_add_test(q3daxis-logvalue SOURCES tst_axis.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3daxis-value/CMakeLists.txt b/tests/auto/cpptest/q3daxis-value/CMakeLists.txt index d7cdd7e3..addb2c10 100644 --- a/tests/auto/cpptest/q3daxis-value/CMakeLists.txt +++ b/tests/auto/cpptest/q3daxis-value/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3daxis-value +qt_internal_add_test(q3daxis-value SOURCES tst_axis.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt index 52ac3301..89fcaa60 100644 --- a/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dbars-modelproxy +qt_internal_add_test(q3dbars-modelproxy SOURCES tst_proxy.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt index 479a684a..d257b113 100644 --- a/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dbars-proxy +qt_internal_add_test(q3dbars-proxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dbars-series/CMakeLists.txt b/tests/auto/cpptest/q3dbars-series/CMakeLists.txt index a1d540ca..c3e44bef 100644 --- a/tests/auto/cpptest/q3dbars-series/CMakeLists.txt +++ b/tests/auto/cpptest/q3dbars-series/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dbars-series +qt_internal_add_test(q3dbars-series SOURCES tst_series.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dbars/CMakeLists.txt b/tests/auto/cpptest/q3dbars/CMakeLists.txt index b182ffc2..95bb5a3d 100644 --- a/tests/auto/cpptest/q3dbars/CMakeLists.txt +++ b/tests/auto/cpptest/q3dbars/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dbars +qt_internal_add_test(q3dbars SOURCES tst_bars.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt b/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt index e1c72685..ae29c699 100644 --- a/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt +++ b/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dcustom-label +qt_internal_add_test(q3dcustom-label SOURCES tst_custom.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt b/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt index ca462e79..5f8d2576 100644 --- a/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt +++ b/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dcustom-volume +qt_internal_add_test(q3dcustom-volume SOURCES tst_custom.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dcustom/CMakeLists.txt b/tests/auto/cpptest/q3dcustom/CMakeLists.txt index 86e937da..e0816b76 100644 --- a/tests/auto/cpptest/q3dcustom/CMakeLists.txt +++ b/tests/auto/cpptest/q3dcustom/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dcustom +qt_internal_add_test(q3dcustom SOURCES tst_custom.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt b/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt index 616d1470..507c78c8 100644 --- a/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt +++ b/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dinput-touch +qt_internal_add_test(q3dinput-touch SOURCES tst_input.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dinput/CMakeLists.txt b/tests/auto/cpptest/q3dinput/CMakeLists.txt index bcd485ba..8254b259 100644 --- a/tests/auto/cpptest/q3dinput/CMakeLists.txt +++ b/tests/auto/cpptest/q3dinput/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dinput +qt_internal_add_test(q3dinput SOURCES tst_input.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt index 232b192a..3f6e0203 100644 --- a/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscatter-modelproxy +qt_internal_add_test(q3dscatter-modelproxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt index a2c7e88c..7875bab5 100644 --- a/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscatter-proxy +qt_internal_add_test(q3dscatter-proxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt index b15b7617..7191dec6 100644 --- a/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscatter-series +qt_internal_add_test(q3dscatter-series SOURCES tst_series.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscatter/CMakeLists.txt b/tests/auto/cpptest/q3dscatter/CMakeLists.txt index c656933a..78136693 100644 --- a/tests/auto/cpptest/q3dscatter/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscatter/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscatter +qt_internal_add_test(q3dscatter SOURCES tst_scatter.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt b/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt index 3ecc41b4..e8abcd46 100644 --- a/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscene-camera +qt_internal_add_test(q3dscene-camera SOURCES tst_camera.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscene-light/CMakeLists.txt b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt index 4ad3fa2a..5908e8ce 100644 --- a/tests/auto/cpptest/q3dscene-light/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscene-light +qt_internal_add_test(q3dscene-light SOURCES tst_light.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dscene/CMakeLists.txt b/tests/auto/cpptest/q3dscene/CMakeLists.txt index 385aeee5..766d3388 100644 --- a/tests/auto/cpptest/q3dscene/CMakeLists.txt +++ b/tests/auto/cpptest/q3dscene/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dscene +qt_internal_add_test(q3dscene SOURCES tst_scene.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt index 8132c2a6..ddff28fd 100644 --- a/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dsurface-heightproxy +qt_internal_add_test(q3dsurface-heightproxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES @@ -10,7 +10,7 @@ set(q3dsurface-heightproxy_resource_files "customtexture.jpg" ) -qt_add_resource(q3dsurface-heightproxy "q3dsurface-heightproxy" +qt_internal_add_resource(q3dsurface-heightproxy "q3dsurface-heightproxy" PREFIX "/" FILES diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt index fc864cf9..0738ba32 100644 --- a/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dsurface-modelproxy +qt_internal_add_test(q3dsurface-modelproxy SOURCES tst_proxy.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt index 6ca50f8f..868c6e3e 100644 --- a/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt +++ b/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dsurface-proxy +qt_internal_add_test(q3dsurface-proxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt index da189866..cd85f2ce 100644 --- a/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt +++ b/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dsurface-series +qt_internal_add_test(q3dsurface-series SOURCES tst_series.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/cpptest/q3dsurface/CMakeLists.txt b/tests/auto/cpptest/q3dsurface/CMakeLists.txt index e57f214a..0cbfae3a 100644 --- a/tests/auto/cpptest/q3dsurface/CMakeLists.txt +++ b/tests/auto/cpptest/q3dsurface/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dsurface +qt_internal_add_test(q3dsurface SOURCES tst_surface.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/cpptest/q3dtheme/CMakeLists.txt b/tests/auto/cpptest/q3dtheme/CMakeLists.txt index 59c14b54..29c1ff21 100644 --- a/tests/auto/cpptest/q3dtheme/CMakeLists.txt +++ b/tests/auto/cpptest/q3dtheme/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(q3dtheme +qt_internal_add_test(q3dtheme SOURCES tst_theme.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/CMakeLists.txt b/tests/auto/qmltest/CMakeLists.txt index 9cb800a0..8ab433b4 100644 --- a/tests/auto/qmltest/CMakeLists.txt +++ b/tests/auto/qmltest/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_test(tst_qmltest +qt_internal_add_test(tst_qmltest QMLTEST SOURCES tst_qmltest.cpp @@ -11,7 +11,7 @@ set(qmltest_resource_files "customtexture.jpg" ) -qt_add_resource(tst_qmltest "qmltest" +qt_internal_add_resource(tst_qmltest "qmltest" PREFIX "/" FILES diff --git a/tests/manual/barstest/CMakeLists.txt b/tests/manual/barstest/CMakeLists.txt index 50c156e5..2f52fba7 100644 --- a/tests/manual/barstest/CMakeLists.txt +++ b/tests/manual/barstest/CMakeLists.txt @@ -15,7 +15,7 @@ set(barstest_resource_files "shuttle.png" ) -qt_add_resource(barstest "barstest" +qt_internal_add_resource(barstest "barstest" PREFIX "/" FILES diff --git a/tests/manual/multigraphs/CMakeLists.txt b/tests/manual/multigraphs/CMakeLists.txt index 5eb6c7c7..26d6739e 100644 --- a/tests/manual/multigraphs/CMakeLists.txt +++ b/tests/manual/multigraphs/CMakeLists.txt @@ -13,7 +13,7 @@ set(multigraphs_resource_files "australia.png" ) -qt_add_resource(multigraphs "multigraphs" +qt_internal_add_resource(multigraphs "multigraphs" PREFIX "/" FILES diff --git a/tests/manual/qmldynamicdata/CMakeLists.txt b/tests/manual/qmldynamicdata/CMakeLists.txt index ee9e6124..62061336 100644 --- a/tests/manual/qmldynamicdata/CMakeLists.txt +++ b/tests/manual/qmldynamicdata/CMakeLists.txt @@ -11,7 +11,7 @@ set(qmldynamicdata_resource_files "qml/qmldynamicdata/main.qml" ) -qt_add_resource(qmldynamicdata "qmldynamicdata" +qt_internal_add_resource(qmldynamicdata "qmldynamicdata" PREFIX "/" FILES diff --git a/tests/manual/qmlgradient/CMakeLists.txt b/tests/manual/qmlgradient/CMakeLists.txt index 067741e2..621634e2 100644 --- a/tests/manual/qmlgradient/CMakeLists.txt +++ b/tests/manual/qmlgradient/CMakeLists.txt @@ -16,7 +16,7 @@ set_source_files_properties("crater.png" PROPERTIES QT_RESOURCE_ALIAS "map" ) -qt_add_resource(qmlgradient "qmlgradient" +qt_internal_add_resource(qmlgradient "qmlgradient" PREFIX "/" FILES diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt index 85dbe2a0..9fc5cd66 100644 --- a/tests/manual/qmlmultitest/CMakeLists.txt +++ b/tests/manual/qmlmultitest/CMakeLists.txt @@ -12,7 +12,7 @@ set(qmlmultitest_resource_files "qml/qmlmultitest/main.qml" ) -qt_add_resource(qmlmultitest "qmlmultitest" +qt_internal_add_resource(qmlmultitest "qmlmultitest" PREFIX "/" FILES diff --git a/tests/manual/qmlperf/CMakeLists.txt b/tests/manual/qmlperf/CMakeLists.txt index 34e9dbd0..c26c0bba 100644 --- a/tests/manual/qmlperf/CMakeLists.txt +++ b/tests/manual/qmlperf/CMakeLists.txt @@ -12,7 +12,7 @@ set(qmlperf_resource_files "qml/qmlperf/main.qml" ) -qt_add_resource(qmlperf "qmlperf" +qt_internal_add_resource(qmlperf "qmlperf" PREFIX "/" FILES diff --git a/tests/manual/qmlvolume/CMakeLists.txt b/tests/manual/qmlvolume/CMakeLists.txt index b7761dfc..2158ae22 100644 --- a/tests/manual/qmlvolume/CMakeLists.txt +++ b/tests/manual/qmlvolume/CMakeLists.txt @@ -12,7 +12,7 @@ set(qmlvolume_resource_files "qml/qmlvolume/main.qml" ) -qt_add_resource(qmlvolume "qmlvolume" +qt_internal_add_resource(qmlvolume "qmlvolume" PREFIX "/" FILES diff --git a/tests/manual/surfacetest/CMakeLists.txt b/tests/manual/surfacetest/CMakeLists.txt index 4f73c200..1555b70d 100644 --- a/tests/manual/surfacetest/CMakeLists.txt +++ b/tests/manual/surfacetest/CMakeLists.txt @@ -20,7 +20,7 @@ set(surfacetest_resource_files "mapimage.png" ) -qt_add_resource(surfacetest "surfacetest" +qt_internal_add_resource(surfacetest "surfacetest" PREFIX "/maps" FILES diff --git a/tests/manual/volumetrictest/CMakeLists.txt b/tests/manual/volumetrictest/CMakeLists.txt index 21228f34..723d0ccd 100644 --- a/tests/manual/volumetrictest/CMakeLists.txt +++ b/tests/manual/volumetrictest/CMakeLists.txt @@ -18,7 +18,7 @@ set(volumetrictest_resource_files "logo_no_padding.png" ) -qt_add_resource(volumetrictest "volumetrictest" +qt_internal_add_resource(volumetrictest "volumetrictest" PREFIX "/" FILES |