diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-08-31 16:46:32 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-04 10:39:37 +0000 |
commit | d5bb8ab9e5f68954168caa067ae8568362f4ff1e (patch) | |
tree | d43e614ec0177f415504a3b8610df6187892af16 /examples | |
parent | 35f57599c9e1184e0eec26ef3e7cb5405b6b3aaf (diff) |
Fix dynamicscene example to use a QML module
Change-Id: I23b87b8ca98721cebc0dc948f0c9bbf741af6cd5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit be260ba5290f8e51519abb5430b85a142b408258)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/dynamicscene/CMakeLists.txt | 68 | ||||
-rw-r--r-- | examples/qml/dynamicscene/GenericSceneItem.qml (renamed from examples/qml/dynamicscene/content/GenericSceneItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/PaletteItem.qml (renamed from examples/qml/dynamicscene/content/PaletteItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/PerspectiveItem.qml (renamed from examples/qml/dynamicscene/content/PerspectiveItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/Sun.qml (renamed from examples/qml/dynamicscene/content/Sun.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/dynamicscene.qml | 15 | ||||
-rw-r--r-- | examples/qml/dynamicscene/dynamicscene.qrc | 28 | ||||
-rw-r--r-- | examples/qml/dynamicscene/images/NOTE (renamed from examples/qml/dynamicscene/content/images/NOTE) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/images/face-smile.png (renamed from examples/qml/dynamicscene/content/images/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/moon.png (renamed from examples/qml/dynamicscene/content/images/moon.png) | bin | 1757 -> 1757 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/rabbit_brown.png (renamed from examples/qml/dynamicscene/content/images/rabbit_brown.png) | bin | 1245 -> 1245 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/rabbit_bw.png (renamed from examples/qml/dynamicscene/content/images/rabbit_bw.png) | bin | 1759 -> 1759 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/star.png (renamed from examples/qml/dynamicscene/content/images/star.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/sun.png (renamed from examples/qml/dynamicscene/content/images/sun.png) | bin | 8110 -> 8110 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/images/tree_s.png (renamed from examples/qml/dynamicscene/content/images/tree_s.png) | bin | 3406 -> 3406 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/itemCreation.js (renamed from examples/qml/dynamicscene/content/itemCreation.js) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/main.cpp | 2 |
17 files changed, 47 insertions, 66 deletions
diff --git a/examples/qml/dynamicscene/CMakeLists.txt b/examples/qml/dynamicscene/CMakeLists.txt index 9353c35427..623ab1f78b 100644 --- a/examples/qml/dynamicscene/CMakeLists.txt +++ b/examples/qml/dynamicscene/CMakeLists.txt @@ -1,13 +1,8 @@ -# Generated from dynamicscene.pro. - -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(dynamicscene LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -15,52 +10,39 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qml/dynamicscene") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Core Gui Quick Qml) -qt_add_executable(dynamicscene - main.cpp -) -set_target_properties(dynamicscene PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(dynamicscene PUBLIC +qt_add_executable(dynamicsceneexample WIN32 MACOSX_BUNDLE main.cpp) + +target_link_libraries(dynamicsceneexample PUBLIC Qt::Core Qt::Gui Qt::Qml Qt::Quick ) - -# Resources: -set(dynamicscene_resource_files - "content/GenericSceneItem.qml" - "content/PaletteItem.qml" - "content/PerspectiveItem.qml" - "content/Sun.qml" - "content/images/NOTE" - "content/images/face-smile.png" - "content/images/moon.png" - "content/images/rabbit_brown.png" - "content/images/rabbit_bw.png" - "content/images/star.png" - "content/images/sun.png" - "content/images/tree_s.png" - "content/itemCreation.js" - "dynamicscene.qml" -) - -qt6_add_resources(dynamicscene "dynamicscene" - PREFIX - "/" - FILES - ${dynamicscene_resource_files} +qt_add_qml_module(dynamicsceneexample + URI dynamicscene + VERSION 1.0 + QML_FILES + "GenericSceneItem.qml" + "PaletteItem.qml" + "PerspectiveItem.qml" + "Sun.qml" + "dynamicscene.qml" + "itemCreation.js" + RESOURCES + "images/NOTE" + "images/face-smile.png" + "images/moon.png" + "images/rabbit_brown.png" + "images/rabbit_bw.png" + "images/star.png" + "images/sun.png" + "images/tree_s.png" ) -install(TARGETS dynamicscene +install(TARGETS dynamicsceneexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/dynamicscene/content/GenericSceneItem.qml b/examples/qml/dynamicscene/GenericSceneItem.qml index bc09fd5817..bc09fd5817 100644 --- a/examples/qml/dynamicscene/content/GenericSceneItem.qml +++ b/examples/qml/dynamicscene/GenericSceneItem.qml diff --git a/examples/qml/dynamicscene/content/PaletteItem.qml b/examples/qml/dynamicscene/PaletteItem.qml index d6df4be870..d6df4be870 100644 --- a/examples/qml/dynamicscene/content/PaletteItem.qml +++ b/examples/qml/dynamicscene/PaletteItem.qml diff --git a/examples/qml/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/PerspectiveItem.qml index d02a188043..d02a188043 100644 --- a/examples/qml/dynamicscene/content/PerspectiveItem.qml +++ b/examples/qml/dynamicscene/PerspectiveItem.qml diff --git a/examples/qml/dynamicscene/content/Sun.qml b/examples/qml/dynamicscene/Sun.qml index 062a6065e0..062a6065e0 100644 --- a/examples/qml/dynamicscene/content/Sun.qml +++ b/examples/qml/dynamicscene/Sun.qml diff --git a/examples/qml/dynamicscene/dynamicscene.qml b/examples/qml/dynamicscene/dynamicscene.qml index 43b4784b13..0775d7593e 100644 --- a/examples/qml/dynamicscene/dynamicscene.qml +++ b/examples/qml/dynamicscene/dynamicscene.qml @@ -51,7 +51,6 @@ import QtQuick import QtQuick.Particles import QtQuick.Controls -import "content" Item { id: window @@ -120,7 +119,7 @@ Item { ImageParticle { id: stars - source: "content/images/star.png" + source: "images/star.png" groups: ["stars"] opacity: .5 } @@ -171,31 +170,31 @@ Item { PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "Sun.qml" - source: "content/images/sun.png" + source: "images/sun.png" image: "images/sun.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "GenericSceneItem.qml" - source: "content/images/moon.png" + source: "images/moon.png" image: "images/moon.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - source: "content/images/tree_s.png" + source: "images/tree_s.png" image: "images/tree_s.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - source: "content/images/rabbit_brown.png" + source: "images/rabbit_brown.png" image: "images/rabbit_brown.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - source: "content/images/rabbit_bw.png" + source: "images/rabbit_bw.png" image: "images/rabbit_bw.png" } } @@ -258,7 +257,7 @@ Item { selectByMouse: true wrapMode: TextEdit.WordWrap - text: "import QtQuick 2.0\nImage {\n id: smile\n x: 360 * Math.random()\n y: 40 * Math.random() \n source: 'content/images/face-smile.png'\n NumberAnimation on opacity { \n to: 0; duration: 1500\n }\n Component.onCompleted: smile.destroy(1500);\n}" + text: "import QtQuick 2.0\nImage {\n id: smile\n x: 360 * Math.random()\n y: 40 * Math.random() \n source: 'images/face-smile.png'\n NumberAnimation on opacity { \n to: 0; duration: 1500\n }\n Component.onCompleted: smile.destroy(1500);\n}" } } } diff --git a/examples/qml/dynamicscene/dynamicscene.qrc b/examples/qml/dynamicscene/dynamicscene.qrc index ad14d313f4..052b9f8536 100644 --- a/examples/qml/dynamicscene/dynamicscene.qrc +++ b/examples/qml/dynamicscene/dynamicscene.qrc @@ -1,18 +1,18 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/dynamicscene"> <file>dynamicscene.qml</file> - <file>content/images/face-smile.png</file> - <file>content/images/moon.png</file> - <file>content/images/NOTE</file> - <file>content/images/rabbit_brown.png</file> - <file>content/images/rabbit_bw.png</file> - <file>content/images/star.png</file> - <file>content/images/sun.png</file> - <file>content/images/tree_s.png</file> - <file>content/GenericSceneItem.qml</file> - <file>content/itemCreation.js</file> - <file>content/PaletteItem.qml</file> - <file>content/PerspectiveItem.qml</file> - <file>content/Sun.qml</file> + <file>images/face-smile.png</file> + <file>images/moon.png</file> + <file>images/NOTE</file> + <file>images/rabbit_brown.png</file> + <file>images/rabbit_bw.png</file> + <file>images/star.png</file> + <file>images/sun.png</file> + <file>images/tree_s.png</file> + <file>GenericSceneItem.qml</file> + <file>itemCreation.js</file> + <file>PaletteItem.qml</file> + <file>PerspectiveItem.qml</file> + <file>Sun.qml</file> </qresource> </RCC> diff --git a/examples/qml/dynamicscene/content/images/NOTE b/examples/qml/dynamicscene/images/NOTE index fcd87f9132..fcd87f9132 100644 --- a/examples/qml/dynamicscene/content/images/NOTE +++ b/examples/qml/dynamicscene/images/NOTE diff --git a/examples/qml/dynamicscene/content/images/face-smile.png b/examples/qml/dynamicscene/images/face-smile.png Binary files differindex 3d66d72578..3d66d72578 100644 --- a/examples/qml/dynamicscene/content/images/face-smile.png +++ b/examples/qml/dynamicscene/images/face-smile.png diff --git a/examples/qml/dynamicscene/content/images/moon.png b/examples/qml/dynamicscene/images/moon.png Binary files differindex 1c0d6066a8..1c0d6066a8 100644 --- a/examples/qml/dynamicscene/content/images/moon.png +++ b/examples/qml/dynamicscene/images/moon.png diff --git a/examples/qml/dynamicscene/content/images/rabbit_brown.png b/examples/qml/dynamicscene/images/rabbit_brown.png Binary files differindex ebfdeed332..ebfdeed332 100644 --- a/examples/qml/dynamicscene/content/images/rabbit_brown.png +++ b/examples/qml/dynamicscene/images/rabbit_brown.png diff --git a/examples/qml/dynamicscene/content/images/rabbit_bw.png b/examples/qml/dynamicscene/images/rabbit_bw.png Binary files differindex 7bff9b92ca..7bff9b92ca 100644 --- a/examples/qml/dynamicscene/content/images/rabbit_bw.png +++ b/examples/qml/dynamicscene/images/rabbit_bw.png diff --git a/examples/qml/dynamicscene/content/images/star.png b/examples/qml/dynamicscene/images/star.png Binary files differindex bdcd36909d..bdcd36909d 100644 --- a/examples/qml/dynamicscene/content/images/star.png +++ b/examples/qml/dynamicscene/images/star.png diff --git a/examples/qml/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/images/sun.png Binary files differindex c5fd36ed39..c5fd36ed39 100644 --- a/examples/qml/dynamicscene/content/images/sun.png +++ b/examples/qml/dynamicscene/images/sun.png diff --git a/examples/qml/dynamicscene/content/images/tree_s.png b/examples/qml/dynamicscene/images/tree_s.png Binary files differindex 6eac35a729..6eac35a729 100644 --- a/examples/qml/dynamicscene/content/images/tree_s.png +++ b/examples/qml/dynamicscene/images/tree_s.png diff --git a/examples/qml/dynamicscene/content/itemCreation.js b/examples/qml/dynamicscene/itemCreation.js index 2829a83410..2829a83410 100644 --- a/examples/qml/dynamicscene/content/itemCreation.js +++ b/examples/qml/dynamicscene/itemCreation.js diff --git a/examples/qml/dynamicscene/main.cpp b/examples/qml/dynamicscene/main.cpp index e28375158d..f6d2ee9a78 100644 --- a/examples/qml/dynamicscene/main.cpp +++ b/examples/qml/dynamicscene/main.cpp @@ -48,4 +48,4 @@ ** ****************************************************************************/ #include "../../quick/shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dynamicscene) +DECLARATIVE_EXAMPLE_MAIN(dynamicscene/dynamicscene) |