aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-08-31 10:45:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-04 10:39:38 +0000
commit786a1d35e576956c7d3e65f16234cd236d452870 (patch)
tree00fd262bf64a15121f0dba3615fba9e3904d3bd9 /examples
parentd5bb8ab9e5f68954168caa067ae8568362f4ff1e (diff)
Fix threading example to use QML modules
Change-Id: I973244a0546e668ba8c65e573747e08f60a506c0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 23ddc51e5e44646d5b54d46414c0a60895d880b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/threading/CMakeLists.txt64
-rw-r--r--examples/quick/threading/threading.qml2
-rw-r--r--examples/quick/threading/threading.qmlproject1
3 files changed, 20 insertions, 47 deletions
diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt
index 08e140ae81..86e17ac1b3 100644
--- a/examples/quick/threading/CMakeLists.txt
+++ b/examples/quick/threading/CMakeLists.txt
@@ -20,66 +20,38 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Qml)
-qt_add_executable(threading
+add_subdirectory("../shared" "shared")
+
+qt_add_executable(threadingexample
main.cpp
)
-set_target_properties(threading PROPERTIES
+set_target_properties(threadingexample PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_link_libraries(threading PUBLIC
+target_link_libraries(threadingexample PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
+ threading_shared
)
-
-# Resources:
-set(threading_resource_files
- "threadedlistmodel/dataloader.mjs"
- "threadedlistmodel/timedisplay.qml"
- "threading.qml"
- "workerscript/Spinner.qml"
- "workerscript/workerscript.mjs"
- "workerscript/workerscript.qml"
-)
-
-qt6_add_resources(threading "threading"
- PREFIX
- "/threading"
- FILES
- ${threading_resource_files}
-)
-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(threading "shared"
- PREFIX
- "/shared"
- BASE
- "../shared"
- FILES
- ${shared_resource_files}
+qt_add_qml_module(threadingexample
+ URI threading
+ VERSION 1.0
+ QML_FILES
+ "threadedlistmodel/dataloader.mjs"
+ "threadedlistmodel/timedisplay.qml"
+ "threading.qml"
+ "workerscript/Spinner.qml"
+ "workerscript/workerscript.mjs"
+ "workerscript/workerscript.qml"
)
-install(TARGETS threading
+install(TARGETS threadingexample
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
)
+bundle_shared(threadingexample)
diff --git a/examples/quick/threading/threading.qml b/examples/quick/threading/threading.qml
index 674e4a4bc6..1732293cf2 100644
--- a/examples/quick/threading/threading.qml
+++ b/examples/quick/threading/threading.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import "../shared" as Examples
+import shared as Examples
Item {
height: 480
diff --git a/examples/quick/threading/threading.qmlproject b/examples/quick/threading/threading.qmlproject
index d17405d4dc..877dcd7d63 100644
--- a/examples/quick/threading/threading.qmlproject
+++ b/examples/quick/threading/threading.qmlproject
@@ -2,6 +2,7 @@ import QmlProject 1.1
Project {
mainFile: "threading.qml"
+ importPaths: ["../"]
/* Include .qml, .js, and image files from current directory and subdirectories */
QmlFiles {