aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-08-31 12:01:53 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-04 10:39:38 +0000
commita733875bce306c9d8897cce7fcc5e1d4080eb122 (patch)
tree10b4509a79ca731f0c9c3df223e555c64c6d1ab7 /examples/quick
parent786a1d35e576956c7d3e65f16234cd236d452870 (diff)
Update text example to use QML modules
Change-Id: If1c8455aa823eb432f10586bdb31a65166ed915d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit e11c320029e9eedf93af2acb6d356aae4acb5d3c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/text/CMakeLists.txt95
-rw-r--r--examples/quick/text/text.qml2
-rw-r--r--examples/quick/text/text.qmlproject1
3 files changed, 35 insertions, 63 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)
diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml
index f97a4e62de..fd63cbd5d0 100644
--- a/examples/quick/text/text.qml
+++ b/examples/quick/text/text.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import "../shared"
+import shared
Item {
height: 480
diff --git a/examples/quick/text/text.qmlproject b/examples/quick/text/text.qmlproject
index c08d9b9a89..5613abe903 100644
--- a/examples/quick/text/text.qmlproject
+++ b/examples/quick/text/text.qmlproject
@@ -2,6 +2,7 @@ import QmlProject 1.1
Project {
mainFile: "text.qml"
+ importPaths: ["../"]
/* Include .qml, .js, and image files from current directory and subdirectories */
QmlFiles {