aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols/wearable/wearable.qrc
Commit message (Collapse)AuthorAgeFilesLines
* Improve wearable exampleMitch Curtis2023-05-241-152/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | - Move all (non-icon) images into one directory for simplicity. - Add explicit qrc prefix to image paths to make them absolute and ensure they're found, fixing some errors. - Fix "XMLHttpRequest: Using GET on a local file is disabled by default" warning by setting QML_XHR_ALLOW_FILE_READ to 1. - Fix "Parameter "page" is not declared" warning. - Replace qt6_add_resources with qt_standard_project_setup and qt_add_qml_module. - Remove unnecessary quotes from CMake file paths. - Replace local settings instance that was accessed via the root context through several files with a singleton. - Make the custom Controls style a proper QML module. - Make the settings singleton its own module to avoid cyclic imports. - Adapt documentation to new paths. - Some ids (in Main.qml) are unused by QML, but used by the documentation, so those are left alone. - Fix qmake build files after these changes. Fixes: QTBUG-112618 Change-Id: I10f6e1f2013fe35eaf4e1e0f4aaa98e6a1ab9c15 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit cd61b622f410cde6c81966cbdbef9f11dc90fdfa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove "2" from Qt Quick Controls directoriesMitch Curtis2022-12-011-0/+155
Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>