diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-08-27 13:55:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-30 07:18:49 +0000 |
| commit | 42372ad11b3271fdedc973d8dd133d9e066803b2 (patch) | |
| tree | 9e5cf28ccf39db7e77f94671685295f005cf7c8d /examples | |
| parent | d52299b71810509640d0324b8fe21c25d91f37d6 (diff) | |
Update the accessibility example to use QML modules
Change-Id: Iec3dad42dd08ac230ffde15b422ae7f68d419e81
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
(cherry picked from commit 9cb0b528e34271ca5bfe4dea214e83bcb4c91da1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/quick-accessibility/Button.qml (renamed from examples/quick/quick-accessibility/content/Button.qml) | 0 | ||||
| -rw-r--r-- | examples/quick/quick-accessibility/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | examples/quick/quick-accessibility/Checkbox.qml (renamed from examples/quick/quick-accessibility/content/Checkbox.qml) | 0 | ||||
| -rw-r--r-- | examples/quick/quick-accessibility/Slider.qml (renamed from examples/quick/quick-accessibility/content/Slider.qml) | 0 | ||||
| -rw-r--r-- | examples/quick/quick-accessibility/accessibility.qml | 3 | ||||
| -rw-r--r-- | examples/quick/quick-accessibility/accessibility.qrc | 6 |
6 files changed, 12 insertions, 19 deletions
diff --git a/examples/quick/quick-accessibility/content/Button.qml b/examples/quick/quick-accessibility/Button.qml index 7a86e31588..7a86e31588 100644 --- a/examples/quick/quick-accessibility/content/Button.qml +++ b/examples/quick/quick-accessibility/Button.qml diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt index 3e8589712b..04189a77a3 100644 --- a/examples/quick/quick-accessibility/CMakeLists.txt +++ b/examples/quick/quick-accessibility/CMakeLists.txt @@ -34,20 +34,14 @@ target_link_libraries(quick-accessibility PUBLIC Qt::Quick ) - -# Resources: -set(accessibility_resource_files - "accessibility.qml" - "content/Button.qml" - "content/Checkbox.qml" - "content/Slider.qml" -) - -qt6_add_resources(quick-accessibility "accessibility" - PREFIX - "/accessibility" - FILES - ${accessibility_resource_files} +qt_add_qml_module(quick-accessibility + URI accessibility + VERSION 1.0 + QML_FILES + "accessibility.qml" + "Button.qml" + "Checkbox.qml" + "Slider.qml" ) install(TARGETS quick-accessibility diff --git a/examples/quick/quick-accessibility/content/Checkbox.qml b/examples/quick/quick-accessibility/Checkbox.qml index ba222bfb3d..ba222bfb3d 100644 --- a/examples/quick/quick-accessibility/content/Checkbox.qml +++ b/examples/quick/quick-accessibility/Checkbox.qml diff --git a/examples/quick/quick-accessibility/content/Slider.qml b/examples/quick/quick-accessibility/Slider.qml index 241e5d804e..241e5d804e 100644 --- a/examples/quick/quick-accessibility/content/Slider.qml +++ b/examples/quick/quick-accessibility/Slider.qml diff --git a/examples/quick/quick-accessibility/accessibility.qml b/examples/quick/quick-accessibility/accessibility.qml index d3365cdd12..5caee3439e 100644 --- a/examples/quick/quick-accessibility/accessibility.qml +++ b/examples/quick/quick-accessibility/accessibility.qml @@ -48,8 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import "content" +import QtQuick Rectangle { id: window diff --git a/examples/quick/quick-accessibility/accessibility.qrc b/examples/quick/quick-accessibility/accessibility.qrc index 462a9a590c..f106d551c8 100644 --- a/examples/quick/quick-accessibility/accessibility.qrc +++ b/examples/quick/quick-accessibility/accessibility.qrc @@ -1,8 +1,8 @@ <RCC> <qresource prefix="/accessibility"> <file>accessibility.qml</file> - <file>content/Button.qml</file> - <file>content/Checkbox.qml</file> - <file>content/Slider.qml</file> + <file>Button.qml</file> + <file>Checkbox.qml</file> + <file>Slider.qml</file> </qresource> </RCC> |