diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-08-31 12:01:53 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-09-04 08:46:56 +0200 |
commit | e11c320029e9eedf93af2acb6d356aae4acb5d3c (patch) | |
tree | 46c9fa83371d9fbcf5f5167e6f5662daa77a8570 /examples/quick/text/CMakeLists.txt | |
parent | 23ddc51e5e44646d5b54d46414c0a60895d880b5 (diff) |
Update text example to use QML modules
Pick-to: 6.2
Change-Id: If1c8455aa823eb432f10586bdb31a65166ed915d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'examples/quick/text/CMakeLists.txt')
-rw-r--r-- | examples/quick/text/CMakeLists.txt | 95 |
1 files changed, 33 insertions, 62 deletions
diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index de3a656d99..8e697cd6c2 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -20,82 +20,53 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS Qml) -qt_add_executable(text +add_subdirectory("../shared" "shared") + +qt_add_executable(textexample main.cpp ) -set_target_properties(text PROPERTIES +set_target_properties(textexample PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(text PUBLIC +target_link_libraries(textexample PUBLIC Qt::Core Qt::Gui Qt::Qml Qt::Quick + text_shared ) - -# Resources: -set(text_resource_files - "fonts/availableFonts.qml" - "fonts/banner.qml" - "fonts/content/fonts/tarzeau_ocr_a.ttf" - "fonts/fonts.qml" - "fonts/hello.qml" - "imgtag/TextWithImage.qml" - "imgtag/images/face-sad.png" - "imgtag/images/face-smile-big.png" - "imgtag/images/face-smile.png" - "imgtag/images/heart200.png" - "imgtag/images/qtlogo.png" - "imgtag/images/starfish_2.png" - "imgtag/imgtag.qml" - "styledtext-layout.qml" - "text.qml" - "textselection/pics/endHandle.png" - "textselection/pics/endHandle.sci" - "textselection/pics/startHandle.png" - "textselection/pics/startHandle.sci" - "textselection/textselection.qml" -) - -qt6_add_resources(text "text" - PREFIX - "/text" - FILES - ${text_resource_files} +qt_add_qml_module(textexample + URI text + VERSION 1.0 + QML_FILES + "fonts/availableFonts.qml" + "fonts/banner.qml" + "fonts/fonts.qml" + "fonts/hello.qml" + "imgtag/TextWithImage.qml" + "imgtag/imgtag.qml" + "styledtext-layout.qml" + "text.qml" + "textselection/textselection.qml" + RESOURCES + "fonts/content/fonts/tarzeau_ocr_a.ttf" + "imgtag/images/face-sad.png" + "imgtag/images/face-smile-big.png" + "imgtag/images/face-smile.png" + "imgtag/images/heart200.png" + "imgtag/images/qtlogo.png" + "imgtag/images/starfish_2.png" + "textselection/pics/endHandle.png" + "textselection/pics/endHandle.sci" + "textselection/pics/startHandle.png" + "textselection/pics/startHandle.sci" ) -set(shared_resource_files - "../shared/Button.qml" - "../shared/CheckBox.qml" - "../shared/FlickrRssModel.qml" - "../shared/Label.qml" - "../shared/LauncherList.qml" - "../shared/SimpleLauncherDelegate.qml" - "../shared/Slider.qml" - "../shared/TabSet.qml" - "../shared/TextField.qml" - "../shared/images/back.png" - "../shared/images/checkmark.png" - "../shared/images/next.png" - "../shared/images/qt-logo.png" - "../shared/images/slider_handle.png" - "../shared/images/tab.png" -) - -qt6_add_resources(text "shared" - PREFIX - "/shared" - BASE - "../shared" - FILES - ${shared_resource_files} -) - -qt_import_qml_plugins(text) # special case -install(TARGETS text +install(TARGETS textexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) +bundle_shared(textexample) |