diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-08-31 09:40:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-31 23:28:43 +0000 |
| commit | abface5d32712cd68026a29f555b462d9904ef9b (patch) | |
| tree | a6ccbf699d8a3eb65bd95e9da9033df95b0f91f7 /examples/quick | |
| parent | b5c2cfcf2cf5252d9de0324af5e855a9b4d489cb (diff) | |
Convert dynamicview tutorial to use QML modules
Change-Id: I98069eea1bd4492aba661e4672ffe297f0dcc4c8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit c10427bc040c6a8dd9d56f0c56175935d1230486)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick')
14 files changed, 203 insertions, 8 deletions
diff --git a/examples/quick/tutorials/CMakeLists.txt b/examples/quick/tutorials/CMakeLists.txt index 8777a16f50..b200b54f9f 100644 --- a/examples/quick/tutorials/CMakeLists.txt +++ b/examples/quick/tutorials/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(samegame) +add_subdirectory(dynamicview) diff --git a/examples/quick/tutorials/dynamicview/CMakeLists.txt b/examples/quick/tutorials/dynamicview/CMakeLists.txt new file mode 100644 index 0000000000..815b9f5a74 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(dynamicview1) +add_subdirectory(dynamicview2) +add_subdirectory(dynamicview3) +add_subdirectory(dynamicview4) diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt new file mode 100644 index 0000000000..2d38954fd9 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.16) +project(dynamicview1 LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview1") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) + +qt_add_executable(dynamicview1 + main.cpp +) +set_target_properties(dynamicview1 PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +qt_add_qml_module(dynamicview1 + URI dynamicview + VERSION 1.0 + QML_FILES + dynamicview.qml + PetsModel.qml +) + +target_link_libraries(dynamicview1 PRIVATE + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +install(TARGETS dynamicview1 + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc index c89a5e3a97..18b503f9cc 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc +++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/dynamicview"> <file>dynamicview.qml</file> <file>PetsModel.qml</file> </qresource> diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/main.cpp b/examples/quick/tutorials/dynamicview/dynamicview1/main.cpp index 72b8b667f5..710b1f868b 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/main.cpp +++ b/examples/quick/tutorials/dynamicview/dynamicview1/main.cpp @@ -48,4 +48,4 @@ ** ****************************************************************************/ #include "../../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dynamicview) +DECLARATIVE_EXAMPLE_MAIN(dynamicview/dynamicview) diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt new file mode 100644 index 0000000000..cbb7ac5b3f --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.16) +project(dynamicview2 LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview2") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) + +qt_add_executable(dynamicview2 + main.cpp +) +set_target_properties(dynamicview2 PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +qt_add_qml_module(dynamicview2 + URI dynamicview + VERSION 1.0 + QML_FILES + dynamicview.qml + PetsModel.qml +) + +target_link_libraries(dynamicview2 PRIVATE + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +install(TARGETS dynamicview2 + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc index c89a5e3a97..18b503f9cc 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc +++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/dynamicview"> <file>dynamicview.qml</file> <file>PetsModel.qml</file> </qresource> diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/main.cpp b/examples/quick/tutorials/dynamicview/dynamicview2/main.cpp index 72b8b667f5..710b1f868b 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/main.cpp +++ b/examples/quick/tutorials/dynamicview/dynamicview2/main.cpp @@ -48,4 +48,4 @@ ** ****************************************************************************/ #include "../../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dynamicview) +DECLARATIVE_EXAMPLE_MAIN(dynamicview/dynamicview) diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt new file mode 100644 index 0000000000..242585423b --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.16) +project(dynamicview3 LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview3") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) + +qt_add_executable(dynamicview3 + main.cpp +) +set_target_properties(dynamicview3 PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +qt_add_qml_module(dynamicview3 + URI dynamicview + VERSION 1.0 + QML_FILES + dynamicview.qml + PetsModel.qml +) + +target_link_libraries(dynamicview3 PRIVATE + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +install(TARGETS dynamicview3 + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc index c89a5e3a97..18b503f9cc 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc +++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/dynamicview"> <file>dynamicview.qml</file> <file>PetsModel.qml</file> </qresource> diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/main.cpp b/examples/quick/tutorials/dynamicview/dynamicview3/main.cpp index 72b8b667f5..710b1f868b 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/main.cpp +++ b/examples/quick/tutorials/dynamicview/dynamicview3/main.cpp @@ -48,4 +48,4 @@ ** ****************************************************************************/ #include "../../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dynamicview) +DECLARATIVE_EXAMPLE_MAIN(dynamicview/dynamicview) diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt new file mode 100644 index 0000000000..2faae8b119 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.16) +project(dynamicview4 LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview4") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) + +qt_add_executable(dynamicview4 + main.cpp +) +set_target_properties(dynamicview4 PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +qt_add_qml_module(dynamicview4 + URI dynamicview + VERSION 1.0 + QML_FILES + dynamicview.qml + ListSelector.qml + PetsModel.qml +) + +target_link_libraries(dynamicview4 PRIVATE + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +install(TARGETS dynamicview4 + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc index 356f65fbfa..8615c442b2 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc +++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc @@ -1,6 +1,7 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/dynamicview"> <file>dynamicview.qml</file> + <file>ListSelector.qml</file> <file>PetsModel.qml</file> <file>ListSelector.qml</file> </qresource> diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/main.cpp b/examples/quick/tutorials/dynamicview/dynamicview4/main.cpp index 72b8b667f5..710b1f868b 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/main.cpp +++ b/examples/quick/tutorials/dynamicview/dynamicview4/main.cpp @@ -48,4 +48,4 @@ ** ****************************************************************************/ #include "../../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dynamicview) +DECLARATIVE_EXAMPLE_MAIN(dynamicview/dynamicview) |