From 08adbefa131ef1c934f55cd61716c8ea836ddf02 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 15:23:08 +0200 Subject: 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: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam --- tests/manual/highdpi/CMakeLists.txt | 2 +- tests/manual/httpserver/CMakeLists.txt | 2 +- tests/manual/mousearea/CMakeLists.txt | 6 +-- tests/manual/nodetypes/CMakeLists.txt | 47 ---------------------- tests/manual/nodetypes_ng/CMakeLists.txt | 4 +- tests/manual/pointer/CMakeLists.txt | 6 +-- tests/manual/qmltypememory/CMakeLists.txt | 2 +- .../manual/qmltypememory/TestPlugin/CMakeLists.txt | 2 +- tests/manual/quickwidgetviewer/CMakeLists.txt | 2 +- tests/manual/scalablepath/CMakeLists.txt | 4 +- .../scenegrabber/.prev_CMakeLists.txt | 4 +- .../scenegrabber/CMakeLists.txt | 4 +- .../scenegraph/.prev_CMakeLists.txt | 2 +- .../scenegraph_lancelot/scenegraph/CMakeLists.txt | 2 +- tests/manual/shapestest/CMakeLists.txt | 4 +- .../tableview/abstracttablemodel/CMakeLists.txt | 4 +- tests/manual/tableview/listmodel/CMakeLists.txt | 4 +- tests/manual/tableview/storagemodel/CMakeLists.txt | 4 +- .../tableview/tablemodel/form/CMakeLists.txt | 4 +- .../tableview/tablemodel/json/CMakeLists.txt | 4 +- tests/manual/text/CMakeLists.txt | 6 +-- tests/manual/touch/CMakeLists.txt | 6 +-- .../v4/auto/executableallocator/CMakeLists.txt | 2 +- 23 files changed, 40 insertions(+), 87 deletions(-) delete mode 100644 tests/manual/nodetypes/CMakeLists.txt (limited to 'tests/manual') diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index 4ae749c660..971e432d1d 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlimageproviderplugin Generic Library: ##################################################################### -qt_add_cmake_library(qmlimageproviderplugin +qt_internal_add_cmake_library(qmlimageproviderplugin MODULE INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider" OUTPUT_DIRECTORY "ImageProvider" diff --git a/tests/manual/httpserver/CMakeLists.txt b/tests/manual/httpserver/CMakeLists.txt index 105799e59e..2717465c82 100644 --- a/tests/manual/httpserver/CMakeLists.txt +++ b/tests/manual/httpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## httpserver Binary: ##################################################################### -qt_add_manual_test(httpserver +qt_internal_add_manual_test(httpserver SOURCES ../../auto/shared/testhttpserver.cpp ../../auto/shared/testhttpserver.h main.cpp diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt index f3b0003ea3..8b1a56018b 100644 --- a/tests/manual/mousearea/CMakeLists.txt +++ b/tests/manual/mousearea/CMakeLists.txt @@ -4,7 +4,7 @@ ## mousearea Binary: ##################################################################### -qt_add_manual_test(mousearea +qt_internal_add_manual_test(mousearea GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qml_resource_files "plainMouseArea.qml" ) -qt_add_resource(mousearea "qml" +qt_internal_add_resource(mousearea "qml" PREFIX "/" FILES @@ -73,7 +73,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(mousearea "quick_shared" +qt_internal_add_resource(mousearea "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/nodetypes/CMakeLists.txt b/tests/manual/nodetypes/CMakeLists.txt deleted file mode 100644 index cdb64701b8..0000000000 --- a/tests/manual/nodetypes/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Generated from nodetypes.pro. - -##################################################################### -## nodetypes Binary: -##################################################################### - -qt_add_manual_test(nodetypes - GUI - SOURCES - nodetypes.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick -) - -# Resources: -set(nodetypes_resource_files - "Animators.qml" - "Effects.qml" - "Images.qml" - "Layers.qml" - "LotsOfImages.qml" - "LotsOfRects.qml" - "Painter.qml" - "Rects.qml" - "Text.qml" - "face-smile.png" - "main.qml" - "ps_shadow1.cso" - "ps_shadow2.cso" - "ps_wobble.cso" - "qt.png" - "shadow.png" - "vs_wobble.cso" -) - -qt_add_resource(nodetypes "nodetypes" - PREFIX - "/" - FILES - ${nodetypes_resource_files} -) - - -#### Keys ignored in scope 1:.:.:nodetypes.pro:: -# OTHER_FILES = "main.qml" "Rects.qml" "LotsOfRects.qml" "Images.qml" "LotsOfImages.qml" "Text.qml" "Animators.qml" "Layers.qml" "Effects.qml" "Painter.qml" "wobble.hlsl" "shadow1.hlsl" "shadow2.hlsl" diff --git a/tests/manual/nodetypes_ng/CMakeLists.txt b/tests/manual/nodetypes_ng/CMakeLists.txt index 5687cb2768..b01cbe0282 100644 --- a/tests/manual/nodetypes_ng/CMakeLists.txt +++ b/tests/manual/nodetypes_ng/CMakeLists.txt @@ -4,7 +4,7 @@ ## nodetypes_ng Binary: ##################################################################### -qt_add_manual_test(nodetypes_ng +qt_internal_add_manual_test(nodetypes_ng GUI SOURCES nodetypes_ng.cpp @@ -52,7 +52,7 @@ set(nodetypes_ng_resource_files "wobble_legacy_gl.vert" ) -qt_add_resource(nodetypes_ng "nodetypes_ng" +qt_internal_add_resource(nodetypes_ng "nodetypes_ng" PREFIX "/" FILES diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index e58fc7f29f..6bdb0f9e78 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## pointer Binary: ##################################################################### -qt_add_manual_test(pointer +qt_internal_add_manual_test(pointer GUI SOURCES inputinspector.cpp inputinspector.h @@ -69,7 +69,7 @@ set(qml_resource_files "tapHandler.qml" ) -qt_add_resource(pointer "qml" +qt_internal_add_resource(pointer "qml" PREFIX "/" FILES @@ -122,7 +122,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(pointer "quick_shared" +qt_internal_add_resource(pointer "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/qmltypememory/CMakeLists.txt b/tests/manual/qmltypememory/CMakeLists.txt index ae3a10e944..621c18dd8b 100644 --- a/tests/manual/qmltypememory/CMakeLists.txt +++ b/tests/manual/qmltypememory/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmltypememory Binary: ##################################################################### -qt_add_manual_test(qmltypememory +qt_internal_add_manual_test(qmltypememory GUI SOURCES main.cpp diff --git a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt index d05139d0ea..25f03ad908 100644 --- a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt +++ b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## testplugin Generic Library: ##################################################################### -qt_add_cmake_library(testplugin +qt_internal_add_cmake_library(testplugin MODULE SOURCES plugin.cpp diff --git a/tests/manual/quickwidgetviewer/CMakeLists.txt b/tests/manual/quickwidgetviewer/CMakeLists.txt index 00245e4942..a48a731e23 100644 --- a/tests/manual/quickwidgetviewer/CMakeLists.txt +++ b/tests/manual/quickwidgetviewer/CMakeLists.txt @@ -4,7 +4,7 @@ ## quickwidgetviewer Binary: ##################################################################### -qt_add_manual_test(quickwidgetviewer +qt_internal_add_manual_test(quickwidgetviewer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/scalablepath/CMakeLists.txt b/tests/manual/scalablepath/CMakeLists.txt index 738c6ebb45..203099699d 100644 --- a/tests/manual/scalablepath/CMakeLists.txt +++ b/tests/manual/scalablepath/CMakeLists.txt @@ -4,7 +4,7 @@ ## scalablepath Binary: ##################################################################### -qt_add_manual_test(scalablepath +qt_internal_add_manual_test(scalablepath GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(scalablepath "qml" +qt_internal_add_resource(scalablepath "qml" PREFIX "/" FILES diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt index 573b2e57c1..cb122bfa76 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlscenegrabber Binary: ##################################################################### -qt_add_manual_test(qmlscenegrabber +qt_internal_add_manual_test(qmlscenegrabber OUTPUT_DIRECTORY ".." SOURCES main.cpp @@ -153,7 +153,7 @@ set(shared_resource_files "shaders/wave.vert" ) -qt_add_resource(qmlscenegrabber "shared" +qt_internal_add_resource(qmlscenegrabber "shared" PREFIX "/" BASE diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt index b5c71ee67e..abf5f648dd 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlscenegrabber Binary: ##################################################################### -qt_add_manual_test(qmlscenegrabber +qt_internal_add_manual_test(qmlscenegrabber OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case SOURCES main.cpp @@ -153,7 +153,7 @@ set(shared_resource_files "shaders/wave.vert" ) -qt_add_resource(qmlscenegrabber "shared" +qt_internal_add_resource(qmlscenegrabber "shared" PREFIX "/" BASE diff --git a/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt index 86f5c102a9..666bc986d5 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../data") -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph OUTPUT_DIRECTORY ".." SOURCES ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt index 407fd9976c..268eae6d58 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../data") -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case SOURCES ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h diff --git a/tests/manual/shapestest/CMakeLists.txt b/tests/manual/shapestest/CMakeLists.txt index 6fd93cdc11..793a798cb8 100644 --- a/tests/manual/shapestest/CMakeLists.txt +++ b/tests/manual/shapestest/CMakeLists.txt @@ -4,7 +4,7 @@ ## shapestest Binary: ##################################################################### -qt_add_manual_test(shapestest +qt_internal_add_manual_test(shapestest GUI SOURCES main.cpp @@ -19,7 +19,7 @@ set(shapestest_resource_files "shapestest.qml" ) -qt_add_resource(shapestest "shapestest" +qt_internal_add_resource(shapestest "shapestest" PREFIX "/shapestest" FILES diff --git a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt index 2aa3d5b797..32d3af34bd 100644 --- a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt +++ b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_abstracttablemodel Binary: ##################################################################### -qt_add_manual_test(tableview_abstracttablemodel +qt_internal_add_manual_test(tableview_abstracttablemodel GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_abstracttablemodel "qmake_immediate" +qt_internal_add_resource(tableview_abstracttablemodel "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/listmodel/CMakeLists.txt b/tests/manual/tableview/listmodel/CMakeLists.txt index 9e4b8871cc..ce39476237 100644 --- a/tests/manual/tableview/listmodel/CMakeLists.txt +++ b/tests/manual/tableview/listmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_listmodel Binary: ##################################################################### -qt_add_manual_test(tableview_listmodel +qt_internal_add_manual_test(tableview_listmodel GUI SOURCES main.cpp @@ -19,7 +19,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_listmodel "qmake_immediate" +qt_internal_add_resource(tableview_listmodel "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/storagemodel/CMakeLists.txt b/tests/manual/tableview/storagemodel/CMakeLists.txt index 747d5f5b40..397db3e1f7 100644 --- a/tests/manual/tableview/storagemodel/CMakeLists.txt +++ b/tests/manual/tableview/storagemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_storage Binary: ##################################################################### -qt_add_manual_test(tableview_storage +qt_internal_add_manual_test(tableview_storage GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_storage "qmake_immediate" +qt_internal_add_resource(tableview_storage "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/tablemodel/form/CMakeLists.txt b/tests/manual/tableview/tablemodel/form/CMakeLists.txt index 4a4a7e28fe..00bea7bddc 100644 --- a/tests/manual/tableview/tablemodel/form/CMakeLists.txt +++ b/tests/manual/tableview/tablemodel/form/CMakeLists.txt @@ -4,7 +4,7 @@ ## form Binary: ##################################################################### -qt_add_manual_test(form +qt_internal_add_manual_test(form GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(form "qmake_immediate" +qt_internal_add_resource(form "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/tablemodel/json/CMakeLists.txt b/tests/manual/tableview/tablemodel/json/CMakeLists.txt index 4251d08269..86d177d08c 100644 --- a/tests/manual/tableview/tablemodel/json/CMakeLists.txt +++ b/tests/manual/tableview/tablemodel/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## json Binary: ##################################################################### -qt_add_manual_test(json +qt_internal_add_manual_test(json GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(json "qmake_immediate" +qt_internal_add_resource(json "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt index 09c6d780e7..78c07f6ca8 100644 --- a/tests/manual/text/CMakeLists.txt +++ b/tests/manual/text/CMakeLists.txt @@ -4,7 +4,7 @@ ## text Binary: ##################################################################### -qt_add_manual_test(text +qt_internal_add_manual_test(text GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(qml_resource_files "textInputPropertiesAndSignals.qml" ) -qt_add_resource(text "qml" +qt_internal_add_resource(text "qml" PREFIX "/" FILES @@ -74,7 +74,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(text "quick_shared" +qt_internal_add_resource(text "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 261bab2d49..28e26e30c3 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -4,7 +4,7 @@ ## touch Binary: ##################################################################### -qt_add_manual_test(touch +qt_internal_add_manual_test(touch GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(qml_resource_files "mpta-crosshairs.qml" ) -qt_add_resource(touch "qml" +qt_internal_add_resource(touch "qml" PREFIX "/" FILES @@ -74,7 +74,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(touch "quick_shared" +qt_internal_add_resource(touch "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt index 7001a270b6..14a4e9c7f3 100644 --- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt +++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_executableallocator Binary: ##################################################################### -qt_add_manual_test(tst_executableallocator +qt_internal_add_manual_test(tst_executableallocator SOURCES tst_executableallocator.cpp PUBLIC_LIBRARIES -- cgit v1.2.3