diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /examples/quick/shapes/shapes.qrc | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'examples/quick/shapes/shapes.qrc')
| -rw-r--r-- | examples/quick/shapes/shapes.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/shapes/shapes.qrc b/examples/quick/shapes/shapes.qrc index e03c0e8a0a..6de463dd33 100644 --- a/examples/quick/shapes/shapes.qrc +++ b/examples/quick/shapes/shapes.qrc @@ -28,5 +28,6 @@ <file alias="item14.qml">content/item14.qml</file> <file alias="item15.qml">content/item15.qml</file> <file alias="item17.qml">content/item17.qml</file> + <file alias="item18.qml">content/item18.qml</file> </qresource> </RCC> |