diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-30 11:32:21 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-30 12:04:22 +0100 |
| commit | 8622862b00cb28ef60d673a82ce404d54333cb76 (patch) | |
| tree | 87023baeeb0749acd87786709b5f4f8b5e423b45 /examples/quickcontrols2/flatstyle | |
| parent | 8f3407fdad75cbdada7d0f46d9b1e323b9d70090 (diff) | |
Fix flatstyle example
Styles must now be proper QML modules; i.e. have a qmldir and be
available in the import path.
Fixes: QTBUG-87848
Change-Id: I07de491be31a24f2b07f68f389600450dc89561c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/quickcontrols2/flatstyle')
| -rw-r--r-- | examples/quickcontrols2/flatstyle/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/quickcontrols2/flatstyle/flatstyle.pro | 7 | ||||
| -rw-r--r-- | examples/quickcontrols2/flatstyle/imports/Flat/Button.qml (renamed from examples/quickcontrols2/flatstyle/Flat/Button.qml) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols2/flatstyle/imports/Flat/CheckBox.qml (renamed from examples/quickcontrols2/flatstyle/Flat/CheckBox.qml) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols2/flatstyle/imports/Flat/Switch.qml (renamed from examples/quickcontrols2/flatstyle/Flat/Switch.qml) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols2/flatstyle/imports/Flat/qmldir | 5 |
6 files changed, 13 insertions, 6 deletions
diff --git a/examples/quickcontrols2/flatstyle/CMakeLists.txt b/examples/quickcontrols2/flatstyle/CMakeLists.txt index 8719fbf4..58c1e0ca 100644 --- a/examples/quickcontrols2/flatstyle/CMakeLists.txt +++ b/examples/quickcontrols2/flatstyle/CMakeLists.txt @@ -39,11 +39,12 @@ target_link_libraries(flatstyle PUBLIC # Resources: set(qmake_immediate_resource_files - "Flat/Button.qml" - "Flat/CheckBox.qml" - "Flat/Switch.qml" "MainForm.ui.qml" "flatstyle.qml" + "imports/Flat/Button.qml" + "imports/Flat/CheckBox.qml" + "imports/Flat/Switch.qml" + "imports/Flat/qmldir" "imports/Theme/Theme.qml" "imports/Theme/qmldir" "qtquickcontrols2.conf" diff --git a/examples/quickcontrols2/flatstyle/flatstyle.pro b/examples/quickcontrols2/flatstyle/flatstyle.pro index fe9e42a8..c430a30a 100644 --- a/examples/quickcontrols2/flatstyle/flatstyle.pro +++ b/examples/quickcontrols2/flatstyle/flatstyle.pro @@ -9,9 +9,10 @@ RESOURCES += \ qtquickcontrols2.conf \ flatstyle.qml \ MainForm.ui.qml \ - Flat/Button.qml \ - Flat/CheckBox.qml \ - Flat/Switch.qml \ + imports/Flat/Button.qml \ + imports/Flat/CheckBox.qml \ + imports/Flat/qmldir \ + imports/Flat/Switch.qml \ imports/Theme/Theme.qml \ imports/Theme/qmldir diff --git a/examples/quickcontrols2/flatstyle/Flat/Button.qml b/examples/quickcontrols2/flatstyle/imports/Flat/Button.qml index f072038a..f072038a 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Button.qml +++ b/examples/quickcontrols2/flatstyle/imports/Flat/Button.qml diff --git a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml b/examples/quickcontrols2/flatstyle/imports/Flat/CheckBox.qml index 01416033..01416033 100644 --- a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml +++ b/examples/quickcontrols2/flatstyle/imports/Flat/CheckBox.qml diff --git a/examples/quickcontrols2/flatstyle/Flat/Switch.qml b/examples/quickcontrols2/flatstyle/imports/Flat/Switch.qml index 1f3bd325..1f3bd325 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Switch.qml +++ b/examples/quickcontrols2/flatstyle/imports/Flat/Switch.qml diff --git a/examples/quickcontrols2/flatstyle/imports/Flat/qmldir b/examples/quickcontrols2/flatstyle/imports/Flat/qmldir new file mode 100644 index 00000000..451a8659 --- /dev/null +++ b/examples/quickcontrols2/flatstyle/imports/Flat/qmldir @@ -0,0 +1,5 @@ +module Flat + +Button 1.0 Button.qml +CheckBox 1.0 CheckBox.qml +Switch 1.0 Switch.qml |