diff options
67 files changed, 168 insertions, 170 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 00000000..89d3074c --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qtquickcontrols2.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(QtQuickControls2 + VERSION 6.0.0 + DESCRIPTION "Qt QuickControls2 Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +if(NOT TARGET Qt::Quick) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") + return() +endif() +qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt index fdd80401..d9a9361f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,5 @@ +# Generated from qtquickcontrols2.pro. + cmake_minimum_required(VERSION 3.15.0) project(QtQuickControls2 @@ -7,7 +9,11 @@ project(QtQuickControls2 LANGUAGES CXX C ) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network Qml Quick QmlTools - OPTIONAL_COMPONENTS QuickTest +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network Qml Quick QmlTools # special case + OPTIONAL_COMPONENTS QuickTest # special case ) +if(NOT TARGET Qt::Quick) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") + return() +endif() qt_build_repo() diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt index 13ad4ced..90f06968 100644 --- a/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(chapter1-settingup PUBLIC Qt::Quick ) + # Resources: set(qml_resource_files "main.qml" @@ -38,7 +39,6 @@ qt6_add_resources(chapter1-settingup "qml" ${qml_resource_files} ) - install(TARGETS chapter1-settingup RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt index a1f36919..1d4d124d 100644 --- a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(chapter2-lists PUBLIC Qt::Quick ) + # Resources: set(qml_resource_files "main.qml" @@ -97,7 +98,6 @@ qt6_add_resources(chapter2-lists "shared" ${shared_resource_files} ) - install(TARGETS chapter2-lists RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt index 5968253b..9b405c47 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(chapter3-navigation PUBLIC Qt::Quick ) + # Resources: set(qml_resource_files "ContactPage.qml" @@ -99,7 +100,6 @@ qt6_add_resources(chapter3-navigation "shared" ${shared_resource_files} ) - install(TARGETS chapter3-navigation RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt index 400da7f9..dfccc0ca 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt @@ -30,6 +30,7 @@ target_link_libraries(chapter4-models PUBLIC Qt::Sql ) + # Resources: set(qml_resource_files "ContactPage.qml" @@ -103,7 +104,6 @@ qt6_add_resources(chapter4-models "shared" ${shared_resource_files} ) - install(TARGETS chapter4-models RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt index beeba245..73b493d1 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt @@ -30,6 +30,7 @@ target_link_libraries(chapter5-styling PUBLIC Qt::Sql ) + # Resources: set(qml_resource_files "+material/ChatToolBar.qml" @@ -106,7 +107,6 @@ qt6_add_resources(chapter5-styling "shared" ${shared_resource_files} ) - install(TARGETS chapter5-styling RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/contactlist/CMakeLists.txt b/examples/quickcontrols2/contactlist/CMakeLists.txt index 381b5e22..ee2a020f 100644 --- a/examples/quickcontrols2/contactlist/CMakeLists.txt +++ b/examples/quickcontrols2/contactlist/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(contactlist PUBLIC Qt::Quick ) + # Resources: set(qmake_immediate_resource_files "ContactDelegate.ui.qml" @@ -43,7 +44,6 @@ qt6_add_resources(contactlist "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS contactlist RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/flatstyle/CMakeLists.txt b/examples/quickcontrols2/flatstyle/CMakeLists.txt index aff7e1a0..54b84b38 100644 --- a/examples/quickcontrols2/flatstyle/CMakeLists.txt +++ b/examples/quickcontrols2/flatstyle/CMakeLists.txt @@ -28,6 +28,7 @@ target_link_libraries(flatstyle PUBLIC Qt::Widgets ) + # Resources: set(qmake_immediate_resource_files "Flat/Button.qml" @@ -47,7 +48,6 @@ qt6_add_resources(flatstyle "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS flatstyle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/gallery/CMakeLists.txt b/examples/quickcontrols2/gallery/CMakeLists.txt index d259a88d..d62169e1 100644 --- a/examples/quickcontrols2/gallery/CMakeLists.txt +++ b/examples/quickcontrols2/gallery/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(gallery PUBLIC Qt::QuickControls2 ) + # Resources: set(qmake_immediate_resource_files "gallery.qml" @@ -91,7 +92,6 @@ qt6_add_resources(gallery "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS gallery RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt index 2c1662a7..22b0bd7b 100644 --- a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt +++ b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(automotive PUBLIC Qt::QuickControls2 ) + # Resources: set(icons_resource_files "automotive/44x44/air-con.png" @@ -176,7 +177,6 @@ qt6_add_resources(automotive "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS automotive RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt index 4d36b744..28b17c95 100644 --- a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt +++ b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(musicplayer PUBLIC Qt::QuickControls2 ) + # Resources: set(icons_resource_files "musicplayer/32x32/bluetooth.png" @@ -207,7 +208,6 @@ qt6_add_resources(musicplayer "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS musicplayer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/sidepanel/CMakeLists.txt b/examples/quickcontrols2/sidepanel/CMakeLists.txt index 4be1c1a2..4946dc2d 100644 --- a/examples/quickcontrols2/sidepanel/CMakeLists.txt +++ b/examples/quickcontrols2/sidepanel/CMakeLists.txt @@ -24,6 +24,7 @@ target_link_libraries(sidepanel PUBLIC Qt::Quick ) + # Resources: set(qmake_immediate_resource_files "doc/images/qtquickcontrols2-sidepanel-landscape.png" @@ -42,7 +43,6 @@ qt6_add_resources(sidepanel "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS sidepanel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/swipetoremove/CMakeLists.txt b/examples/quickcontrols2/swipetoremove/CMakeLists.txt index ea4fce5f..cf23122c 100644 --- a/examples/quickcontrols2/swipetoremove/CMakeLists.txt +++ b/examples/quickcontrols2/swipetoremove/CMakeLists.txt @@ -24,6 +24,7 @@ target_link_libraries(swipetoremove PUBLIC Qt::Qml ) + # Resources: set(qmake_immediate_resource_files "fonts/fontello.ttf" @@ -37,7 +38,6 @@ qt6_add_resources(swipetoremove "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS swipetoremove RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols2/texteditor/CMakeLists.txt b/examples/quickcontrols2/texteditor/CMakeLists.txt index 99364bbe..9ae1a04d 100644 --- a/examples/quickcontrols2/texteditor/CMakeLists.txt +++ b/examples/quickcontrols2/texteditor/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(texteditor PUBLIC Qt::QuickControls2 ) + # Resources: set(texteditor_resource_files "+touch/texteditor.html" @@ -45,19 +46,16 @@ qt6_add_resources(texteditor "texteditor" ${texteditor_resource_files} ) - if(TARGET Qt::Widgets) target_link_libraries(texteditor PUBLIC Qt::Widgets ) - endif() if(cross_compile) target_compile_definitions(texteditor PUBLIC QT_EXTRA_FILE_SELECTOR=\\\"touch\\\" ) - endif() install(TARGETS texteditor diff --git a/examples/quickcontrols2/wearable/CMakeLists.txt b/examples/quickcontrols2/wearable/CMakeLists.txt index 67902d12..d0be1111 100644 --- a/examples/quickcontrols2/wearable/CMakeLists.txt +++ b/examples/quickcontrols2/wearable/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(wearable PUBLIC Qt::QuickControls2 ) + # Resources: set(wearable_resource_files "icons/wearable/36x36/alarms.png" @@ -188,7 +189,6 @@ qt6_add_resources(wearable "wearable" ${wearable_resource_files} ) - install(TARGETS wearable RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/src/imports/calendar/CMakeLists.txt b/src/imports/calendar/CMakeLists.txt index 01fb2a71..bc9e7f08 100644 --- a/src/imports/calendar/CMakeLists.txt +++ b/src/imports/calendar/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtlabscalendarplugin Plugin: ##################################################################### -add_qml_module(qtlabscalendarplugin +qt_add_qml_module(qtlabscalendarplugin URI "Qt.labs.calendar" VERSION "1.0" CLASSNAME QtLabsCalendarPlugin @@ -38,7 +38,6 @@ add_qml_module(qtlabscalendarplugin # IMPORT_VERSION = "1.0" # OTHER_FILES = "qmldir" # TARGETPATH = "Qt/labs/calendar" -# _LOADED = "qml_plugin" ## Scopes: ##################################################################### @@ -62,7 +61,7 @@ qt6_target_qml_files(qtlabscalendarplugin FILES ${qml_files} ) -add_qt_docs(qtlabscalendarplugin +qt_add_docs(qtlabscalendarplugin doc/qtlabscalendar.qdocconf ) diff --git a/src/imports/controls/.prev_CMakeLists.txt b/src/imports/controls/.prev_CMakeLists.txt index 30d8a0b8..e017f0fe 100644 --- a/src/imports/controls/.prev_CMakeLists.txt +++ b/src/imports/controls/.prev_CMakeLists.txt @@ -73,7 +73,6 @@ add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/calendar/*.qdoc" "$$PWD/src/templates/*.qdoc" # TARGETPATH = "QtQuick/Controls.2" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-default)" ## Scopes: diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index abb531fc..ae0d1e60 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2plugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2plugin +qt_add_qml_module(qtquickcontrols2plugin TARGET_PATH "QtQuick/Controls.2" URI "QtQuick.Controls" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -61,7 +61,9 @@ set(qtquickcontrols2plugin_resource_files "images/drop-indicator@4x.png" ) -add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin" +qt_add_resource(qtquickcontrols2plugin "qtquickcontrols2plugin" + PREFIX + "/qt-project.org/imports/QtQuick/Controls.2" FILES ${qtquickcontrols2plugin_resource_files} ) @@ -71,7 +73,6 @@ add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/calendar/*.qdoc" "$$PWD/src/templates/*.qdoc" # TARGETPATH = "QtQuick/Controls.2" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-default)" ## Scopes: @@ -139,7 +140,7 @@ qt6_target_qml_files(qtquickcontrols2plugin FILES ${qml_files} ) -add_qt_docs(qtquickcontrols2plugin +qt_add_docs(qtquickcontrols2plugin doc/qtquickcontrols.qdocconf ) diff --git a/src/imports/controls/fusion/.prev_CMakeLists.txt b/src/imports/controls/fusion/.prev_CMakeLists.txt index f2b3cd5e..2fb5b2a1 100644 --- a/src/imports/controls/fusion/.prev_CMakeLists.txt +++ b/src/imports/controls/fusion/.prev_CMakeLists.txt @@ -65,7 +65,7 @@ add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Fusion" -# _LOADED = "qml_plugin" +# _REQUIREMENTS = "qtConfig(quickcontrols2-fusion)" set(qml_files "ApplicationWindow.qml" @@ -122,10 +122,6 @@ set(qml_files "Tumbler.qml" ) -set_source_files_properties(${qml_files} PROPERTIES - QT_QML_SOURCE_INSTALL TRUE -) - qt6_target_qml_files(qtquickcontrols2fusionstyleplugin FILES ${qml_files} diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index 581dc739..ee8f2c92 100644 --- a/src/imports/controls/fusion/CMakeLists.txt +++ b/src/imports/controls/fusion/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2fusionstyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2fusionstyleplugin +qt_add_qml_module(qtquickcontrols2fusionstyleplugin TARGET_PATH "QtQuick/Controls.2/Fusion" URI "QtQuick.Controls.Fusion" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -52,7 +52,7 @@ set(qtquickcontrols2fusionstyle_resource_files "images/progressmask@4x.png" ) -add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" +qt_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" PREFIX "/qt-project.org/imports/QtQuick/Controls.2/Fusion" FILES @@ -65,7 +65,6 @@ add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Fusion" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-fusion)" set(qml_files diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt index b2a50e05..5deb1489 100644 --- a/src/imports/controls/imagine/.prev_CMakeLists.txt +++ b/src/imports/controls/imagine/.prev_CMakeLists.txt @@ -65,7 +65,7 @@ add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imagin # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Imagine" -# _LOADED = "qml_plugin" +# _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)" set(qml_files "ApplicationWindow.qml" @@ -116,10 +116,6 @@ set(qml_files "Tumbler.qml" ) -set_source_files_properties(${qml_files} PROPERTIES - QT_QML_SOURCE_INSTALL TRUE -) - qt6_target_qml_files(qtquickcontrols2imaginestyleplugin FILES ${qml_files} diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index 98661788..f0435255 100644 --- a/src/imports/controls/imagine/CMakeLists.txt +++ b/src/imports/controls/imagine/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2imaginestyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2imaginestyleplugin +qt_add_qml_module(qtquickcontrols2imaginestyleplugin TARGET_PATH "QtQuick/Controls.2/Imagine" URI "QtQuick.Controls.Imagine" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -52,7 +52,7 @@ set(qmake_qtquickcontrols2imaginestyle_resource_files ${resource_glob_1} ) -add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" +qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" PREFIX "qt-project.org/imports/QtQuick/Controls.2/Imagine" FILES @@ -65,7 +65,6 @@ add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imagin # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Imagine" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)" set(qml_files diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt index 3cf6d5d2..15fe3519 100644 --- a/src/imports/controls/material/.prev_CMakeLists.txt +++ b/src/imports/controls/material/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Material" -# _LOADED = "qml_plugin" +# _REQUIREMENTS = "qtConfig(quickcontrols2-material)" set(qml_files "ApplicationWindow.qml" @@ -130,10 +130,6 @@ set(qml_files "Tumbler.qml" ) -set_source_files_properties(${qml_files} PROPERTIES - QT_QML_SOURCE_INSTALL TRUE -) - qt6_target_qml_files(qtquickcontrols2materialstyleplugin FILES ${qml_files} diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index ae5ffe83..c6a2be63 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2materialstyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2materialstyleplugin +qt_add_qml_module(qtquickcontrols2materialstyleplugin TARGET_PATH "QtQuick/Controls.2/Material" URI "QtQuick.Controls.Material" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -56,7 +56,7 @@ set(qtquickcontrols2materialstyleplugin_resource_files "shaders/RectangularGlow.frag" ) -add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" +qt_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls.2/Material" FILES @@ -69,7 +69,6 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Material" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-material)" set(qml_files diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt index c14876da..f78b6e49 100644 --- a/src/imports/controls/universal/.prev_CMakeLists.txt +++ b/src/imports/controls/universal/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universals # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Universal" -# _LOADED = "qml_plugin" +# _REQUIREMENTS = "qtConfig(quickcontrols2-universal)" set(qml_files "ApplicationWindow.qml" @@ -124,10 +124,6 @@ set(qml_files "Tumbler.qml" ) -set_source_files_properties(${qml_files} PROPERTIES - QT_QML_SOURCE_INSTALL TRUE -) - qt6_target_qml_files(qtquickcontrols2universalstyleplugin FILES ${qml_files} diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index 3f4ef34b..802e40f2 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2universalstyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2universalstyleplugin +qt_add_qml_module(qtquickcontrols2universalstyleplugin TARGET_PATH "QtQuick/Controls.2/Universal" URI "QtQuick.Controls.Universal" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -56,7 +56,7 @@ set(qtquickcontrols2universalstyleplugin_resource_files "images/rightarrow@4x.png" ) -add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" +qt_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls.2/Universal" FILES @@ -69,7 +69,6 @@ add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universals # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" # TARGETPATH = "QtQuick/Controls.2/Universal" -# _LOADED = "qml_plugin" # _REQUIREMENTS = "qtConfig(quickcontrols2-universal)" set(qml_files diff --git a/src/imports/platform/CMakeLists.txt b/src/imports/platform/CMakeLists.txt index fdcd46c9..40001e72 100644 --- a/src/imports/platform/CMakeLists.txt +++ b/src/imports/platform/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtlabsplatformplugin Plugin: ##################################################################### -add_qml_module(qtlabsplatformplugin +qt_add_qml_module(qtlabsplatformplugin URI "Qt.labs.platform" VERSION "1.0" CLASSNAME QtLabsPlatformPlugin @@ -44,59 +44,58 @@ add_qml_module(qtlabsplatformplugin # IMPORT_VERSION = "1.0" # OTHER_FILES = "qmldir" # TARGETPATH = "Qt/labs/platform" -# _LOADED = "qml_plugin" ## Scopes: ##################################################################### -extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets SOURCES widgets/qwidgetplatform_p.h PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformsystemtrayicon.cpp widgets/qwidgetplatformsystemtrayicon_p.h ) -extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets AND (QT_FEATURE_colordialog OR QT_FEATURE_filedialog OR QT_FEATURE_fontdialog OR QT_FEATURE_messagebox) +qt_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets AND (QT_FEATURE_colordialog OR QT_FEATURE_filedialog OR QT_FEATURE_fontdialog OR QT_FEATURE_messagebox) SOURCES widgets/qwidgetplatformdialog.cpp widgets/qwidgetplatformdialog_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformcolordialog.cpp widgets/qwidgetplatformcolordialog_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformfiledialog.cpp widgets/qwidgetplatformfiledialog_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformfontdialog.cpp widgets/qwidgetplatformfontdialog_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_menu AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_menu AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformmenu.cpp widgets/qwidgetplatformmenu_p.h widgets/qwidgetplatformmenuitem.cpp widgets/qwidgetplatformmenuitem_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_messagebox AND TARGET Qt::Widgets +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_messagebox AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformmessagedialog.cpp widgets/qwidgetplatformmessagedialog_p.h ) -extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon SOURCES qquickplatformsystemtrayicon.cpp qquickplatformsystemtrayicon_p.h ) -add_qt_docs(qtlabsplatformplugin +qt_add_docs(qtlabsplatformplugin doc/qtlabsplatform.qdocconf ) diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt index f2ceae84..4e6a80c4 100644 --- a/src/imports/templates/CMakeLists.txt +++ b/src/imports/templates/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquicktemplates2plugin Plugin: ##################################################################### -add_qml_module(qtquicktemplates2plugin +qt_add_qml_module(qtquicktemplates2plugin TARGET_PATH "QtQuick/Templates.2" URI "QtQuick.Templates" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -34,4 +34,3 @@ add_qml_module(qtquicktemplates2plugin # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" # TARGETPATH = "QtQuick/Templates.2" -# _LOADED = "qml_plugin" diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt index 7c4aaf1f..ec954c32 100644 --- a/src/quickcontrols2/CMakeLists.txt +++ b/src/quickcontrols2/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickControls2 Module: ##################################################################### -add_qt_module(QuickControls2 +qt_add_module(QuickControls2 SOURCES qquickanimatednode.cpp qquickanimatednode_p.h qquickattachedobject.cpp qquickattachedobject_p.h @@ -42,12 +42,11 @@ add_qt_module(QuickControls2 #### Keys ignored in scope 1:.:.:quickcontrols2.pro:<TRUE>: # MODULE = "quickcontrols2" -# _LOADED = "qt_module" ## Scopes: ##################################################################### -extend_target(QuickControls2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview +qt_extend_target(QuickControls2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview SOURCES qquicktumblerview.cpp qquicktumblerview_p.h ) diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt index 3cc21ac9..98e39274 100644 --- a/src/quicktemplates2/CMakeLists.txt +++ b/src/quicktemplates2/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickTemplates2 Module: ##################################################################### -add_qt_module(QuickTemplates2 +qt_add_module(QuickTemplates2 SOURCES qquickabstractbutton.cpp qquickabstractbutton_p.h qquickabstractbutton_p_p.h @@ -129,19 +129,18 @@ add_qt_module(QuickTemplates2 #### Keys ignored in scope 1:.:.:quicktemplates2.pro:<TRUE>: # MODULE = "quicktemplates2" -# _LOADED = "qt_module" ## Scopes: ##################################################################### -extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels +qt_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels LIBRARIES Qt::QmlModelsPrivate PUBLIC_LIBRARIES Qt::QmlModels ) -extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview +qt_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview SOURCES qquicktumbler.cpp qquicktumbler_p.h qquicktumbler_p_p.h diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt index 3712803a..5d239ddc 100644 --- a/tests/auto/accessibility/CMakeLists.txt +++ b/tests/auto/accessibility/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_accessibility +qt_add_test(tst_accessibility SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_accessibility ## Scopes: ##################################################################### -extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/calendar/CMakeLists.txt b/tests/auto/calendar/CMakeLists.txt index f729018f..34937d14 100644 --- a/tests/auto/calendar/CMakeLists.txt +++ b/tests/auto/calendar/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_calendar +qt_add_test(tst_calendar GUI QMLTEST SOURCES diff --git a/tests/auto/controls/default/CMakeLists.txt b/tests/auto/controls/default/CMakeLists.txt index 147a02be..9a4f6cbd 100644 --- a/tests/auto/controls/default/CMakeLists.txt +++ b/tests/auto/controls/default/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_default +qt_add_test(tst_default GUI QMLTEST SOURCES diff --git a/tests/auto/controls/fusion/CMakeLists.txt b/tests/auto/controls/fusion/CMakeLists.txt index 4426c320..fd348526 100644 --- a/tests/auto/controls/fusion/CMakeLists.txt +++ b/tests/auto/controls/fusion/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_fusion +qt_add_test(tst_fusion GUI QMLTEST SOURCES diff --git a/tests/auto/controls/imagine/CMakeLists.txt b/tests/auto/controls/imagine/CMakeLists.txt index c41f75a2..9d7f2e3a 100644 --- a/tests/auto/controls/imagine/CMakeLists.txt +++ b/tests/auto/controls/imagine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_imagine +qt_add_test(tst_imagine GUI QMLTEST SOURCES diff --git a/tests/auto/controls/material/CMakeLists.txt b/tests/auto/controls/material/CMakeLists.txt index f4ae1e62..04c2655a 100644 --- a/tests/auto/controls/material/CMakeLists.txt +++ b/tests/auto/controls/material/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_material +qt_add_test(tst_material GUI QMLTEST SOURCES diff --git a/tests/auto/controls/universal/CMakeLists.txt b/tests/auto/controls/universal/CMakeLists.txt index f12a05af..e5576020 100644 --- a/tests/auto/controls/universal/CMakeLists.txt +++ b/tests/auto/controls/universal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_universal +qt_add_test(tst_universal GUI QMLTEST SOURCES diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt index d1db2aa6..9d58b48e 100644 --- a/tests/auto/cursor/CMakeLists.txt +++ b/tests/auto/cursor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_cursor +qt_add_test(tst_cursor SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_cursor ## Scopes: ##################################################################### -extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt index d012b7c1..2e25d8a4 100644 --- a/tests/auto/customization/CMakeLists.txt +++ b/tests/auto/customization/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_customization +qt_add_test(tst_customization SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ add_qt_test(tst_customization ## Scopes: ##################################################################### -extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt index b70c80d1..5731e570 100644 --- a/tests/auto/designer/CMakeLists.txt +++ b/tests/auto/designer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_designer Test: ##################################################################### -add_qt_test(tst_designer +qt_add_test(tst_designer SOURCES tst_designer.cpp LIBRARIES diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt index cb182044..be2a3016 100644 --- a/tests/auto/focus/CMakeLists.txt +++ b/tests/auto/focus/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_focus +qt_add_test(tst_focus SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ add_qt_test(tst_focus ## Scopes: ##################################################################### -extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt index 75a30fe1..daeb391f 100644 --- a/tests/auto/font/CMakeLists.txt +++ b/tests/auto/font/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_font +qt_add_test(tst_font SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -41,12 +41,12 @@ add_qt_test(tst_font ## Scopes: ##################################################################### -extend_target(tst_font CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_font CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt index e0ca9bb8..6675af36 100644 --- a/tests/auto/palette/CMakeLists.txt +++ b/tests/auto/palette/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_palette +qt_add_test(tst_palette SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,7 +40,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_palette "qmake_immediate" +qt_add_resource(tst_palette "qmake_immediate" PREFIX "/" FILES @@ -54,12 +54,12 @@ add_qt_resource(tst_palette "qmake_immediate" ## Scopes: ##################################################################### -extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/platform/CMakeLists.txt b/tests/auto/platform/CMakeLists.txt index 5fba6eb1..ec4e54ee 100644 --- a/tests/auto/platform/CMakeLists.txt +++ b/tests/auto/platform/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_platform +qt_add_test(tst_platform GUI QMLTEST SOURCES diff --git a/tests/auto/pressandhold/CMakeLists.txt b/tests/auto/pressandhold/CMakeLists.txt index 2564081d..a5c1b845 100644 --- a/tests/auto/pressandhold/CMakeLists.txt +++ b/tests/auto/pressandhold/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_pressandhold Test: ##################################################################### -add_qt_test(tst_pressandhold +qt_add_test(tst_pressandhold SOURCES tst_pressandhold.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt index 78cfc9dc..26aa0331 100644 --- a/tests/auto/qquickapplicationwindow/CMakeLists.txt +++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickapplicationwindow +qt_add_test(tst_qquickapplicationwindow SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -41,12 +41,12 @@ add_qt_test(tst_qquickapplicationwindow ## Scopes: ##################################################################### -extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickcolor/CMakeLists.txt b/tests/auto/qquickcolor/CMakeLists.txt index 7e74b935..bf660d10 100644 --- a/tests/auto/qquickcolor/CMakeLists.txt +++ b/tests/auto/qquickcolor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickcolor +qt_add_test(tst_qquickcolor GUI QMLTEST SOURCES diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt index 292d401a..db35045a 100644 --- a/tests/auto/qquickdrawer/CMakeLists.txt +++ b/tests/auto/qquickdrawer/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickdrawer +qt_add_test(tst_qquickdrawer SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquickdrawer ## Scopes: ##################################################################### -extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index bd78aab0..c2628782 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickiconimage +qt_add_test(tst_qquickiconimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -56,7 +56,7 @@ set(resources_resource_files "icons/testtheme/index.theme" ) -add_qt_resource(tst_qquickiconimage "resources" +qt_add_resource(tst_qquickiconimage "resources" PREFIX "/" FILES @@ -67,17 +67,17 @@ add_qt_resource(tst_qquickiconimage "resources" ## Scopes: ##################################################################### -extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg +qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg PUBLIC_LIBRARIES Qt::Svg ) -extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt index d1855bda..fc3de622 100644 --- a/tests/auto/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/qquickiconlabel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickiconlabel +qt_add_test(tst_qquickiconlabel SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,12 +38,12 @@ add_qt_test(tst_qquickiconlabel ## Scopes: ##################################################################### -extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt index 57e00c9a..5ab0176c 100644 --- a/tests/auto/qquickimaginestyle/CMakeLists.txt +++ b/tests/auto/qquickimaginestyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickimaginestyle +qt_add_test(tst_qquickimaginestyle GUI QMLTEST SOURCES @@ -26,7 +26,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_qquickimaginestyle "qmake_immediate" +qt_add_resource(tst_qquickimaginestyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyle/CMakeLists.txt b/tests/auto/qquickmaterialstyle/CMakeLists.txt index 1f43a0c1..cf43db51 100644 --- a/tests/auto/qquickmaterialstyle/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmaterialstyle +qt_add_test(tst_qquickmaterialstyle GUI QMLTEST SOURCES @@ -25,7 +25,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_qquickmaterialstyle "qmake_immediate" +qt_add_resource(tst_qquickmaterialstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt index 6c4b296a..054b0cc3 100644 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmaterialstyleconf +qt_add_test(tst_qquickmaterialstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -42,7 +42,7 @@ set(qquickmaterialstyleconf_resource_files "variant-normal.conf" ) -add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" +qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" PREFIX "/" FILES @@ -56,12 +56,12 @@ add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" ## Scopes: ##################################################################### -extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt index 13d0fec0..4152869c 100644 --- a/tests/auto/qquickmenu/CMakeLists.txt +++ b/tests/auto/qquickmenu/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmenu +qt_add_test(tst_qquickmenu SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquickmenu ## Scopes: ##################################################################### -extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt index 567cd711..c066ef01 100644 --- a/tests/auto/qquickmenubar/CMakeLists.txt +++ b/tests/auto/qquickmenubar/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmenubar +qt_add_test(tst_qquickmenubar SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquickmenubar ## Scopes: ##################################################################### -extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt index b2da6d88..dc8e0a5b 100644 --- a/tests/auto/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/qquickninepatchimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickninepatchimage +qt_add_test(tst_qquickninepatchimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -42,12 +42,12 @@ add_qt_test(tst_qquickninepatchimage ## Scopes: ##################################################################### -extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt index 7f2c38e9..7df9ac8a 100644 --- a/tests/auto/qquickpopup/CMakeLists.txt +++ b/tests/auto/qquickpopup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpopup +qt_add_test(tst_qquickpopup SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquickpopup ## Scopes: ##################################################################### -extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt index e01d8a9d..ea824969 100644 --- a/tests/auto/qquickstyle/CMakeLists.txt +++ b/tests/auto/qquickstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickstyle +qt_add_test(tst_qquickstyle SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -60,7 +60,7 @@ set(qmake_qrcStyles1_resource_files ${resource_glob_0} ) -add_qt_resource(tst_qquickstyle "qmake_qrcStyles1" +qt_add_resource(tst_qquickstyle "qmake_qrcStyles1" PREFIX "/" FILES @@ -70,7 +70,7 @@ set(qmake_qrcStyles2_resource_files ${resource_glob_1} ) -add_qt_resource(tst_qquickstyle "qmake_qrcStyles2" +qt_add_resource(tst_qquickstyle "qmake_qrcStyles2" PREFIX "/" FILES @@ -80,7 +80,7 @@ set(qmake_qrcStyles3_resource_files ${resource_glob_2} ) -add_qt_resource(tst_qquickstyle "qmake_qrcStyles3" +qt_add_resource(tst_qquickstyle "qmake_qrcStyles3" PREFIX "/" FILES @@ -90,7 +90,7 @@ set(qmake_qrcStyles4_resource_files ${resource_glob_3} ) -add_qt_resource(tst_qquickstyle "qmake_qrcStyles4" +qt_add_resource(tst_qquickstyle "qmake_qrcStyles4" PREFIX "/" FILES @@ -101,12 +101,12 @@ add_qt_resource(tst_qquickstyle "qmake_qrcStyles4" ## Scopes: ##################################################################### -extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyleselector/CMakeLists.txt b/tests/auto/qquickstyleselector/CMakeLists.txt index d01a7833..b9d8d671 100644 --- a/tests/auto/qquickstyleselector/CMakeLists.txt +++ b/tests/auto/qquickstyleselector/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickstyleselector +qt_add_test(tst_qquickstyleselector SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,7 +40,7 @@ set(qmake_resourcestyle_resource_files "ResourceStyle/Button.qml" ) -add_qt_resource(tst_qquickstyleselector "qmake_resourcestyle" +qt_add_resource(tst_qquickstyleselector "qmake_resourcestyle" PREFIX "/" FILES @@ -54,12 +54,12 @@ add_qt_resource(tst_qquickstyleselector "qmake_resourcestyle" ## Scopes: ##################################################################### -extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickuniversalstyle/CMakeLists.txt b/tests/auto/qquickuniversalstyle/CMakeLists.txt index 7775afa0..99816bef 100644 --- a/tests/auto/qquickuniversalstyle/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickuniversalstyle +qt_add_test(tst_qquickuniversalstyle GUI QMLTEST SOURCES @@ -25,7 +25,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_qquickuniversalstyle "qmake_immediate" +qt_add_resource(tst_qquickuniversalstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt index 8de13b0f..361e690f 100644 --- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickuniversalstyleconf +qt_add_test(tst_qquickuniversalstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -40,7 +40,7 @@ set(qquickuniversalstyleconf_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" +qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" PREFIX "/" FILES @@ -54,12 +54,12 @@ add_qt_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" ## Scopes: ##################################################################### -extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/revisions/CMakeLists.txt b/tests/auto/revisions/CMakeLists.txt index 46c1d4c9..be0754fc 100644 --- a/tests/auto/revisions/CMakeLists.txt +++ b/tests/auto/revisions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_revisions Test: ##################################################################### -add_qt_test(tst_revisions +qt_add_test(tst_revisions SOURCES tst_revisions.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt index 0e566d95..f4f6fcdc 100644 --- a/tests/auto/sanity/CMakeLists.txt +++ b/tests/auto/sanity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sanity Test: ##################################################################### -add_qt_test(tst_sanity +qt_add_test(tst_sanity SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -34,12 +34,12 @@ add_qt_test(tst_sanity ## Scopes: ##################################################################### -extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt index 2ec9620e..f5d60a40 100644 --- a/tests/auto/snippets/CMakeLists.txt +++ b/tests/auto/snippets/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_snippets +qt_add_test(tst_snippets SOURCES tst_snippets.cpp DEFINES diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt index d1365266..312c3970 100644 --- a/tests/benchmarks/creationtime/CMakeLists.txt +++ b/tests/benchmarks/creationtime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_creationtime Test: ##################################################################### -add_qt_test(tst_creationtime +qt_add_test(tst_creationtime SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -33,12 +33,12 @@ add_qt_test(tst_creationtime ## Scopes: ##################################################################### -extend_target(tst_creationtime CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_creationtime CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt index 3ba8cafe..1f284128 100644 --- a/tests/benchmarks/objectcount/CMakeLists.txt +++ b/tests/benchmarks/objectcount/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_objectcount Test: ##################################################################### -add_qt_test(tst_objectcount +qt_add_test(tst_objectcount SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -33,12 +33,12 @@ add_qt_test(tst_objectcount ## Scopes: ##################################################################### -extend_target(tst_objectcount CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_objectcount CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |