diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-06-26 18:38:27 +0200 |
|---|---|---|
| committer | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-07-11 16:44:33 +0200 |
| commit | b6e6e737f1a4a7e48989a6a036e25c238304802f (patch) | |
| tree | 8d4b5940b92ad1fc94e46c1742acd9355e19e1d4 /examples/quick/shapes/shapes.qrc | |
| parent | d5b3f5da9cfa90fc43f29f3bdeec01884a47d6ca (diff) | |
| parent | 4beee1a6dcc1be57aa6fb2a175dadc6ff298545d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Conflicts:
examples/quick/shared/LauncherList.qml
src/quick/items/qquickevents.cpp
src/quick/items/qquickevents_p_p.h
src/quick/items/qquickwindow.cpp
tests/auto/quick/touchmouse/tst_touchmouse.cpp
Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b
Diffstat (limited to 'examples/quick/shapes/shapes.qrc')
| -rw-r--r-- | examples/quick/shapes/shapes.qrc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/examples/quick/shapes/shapes.qrc b/examples/quick/shapes/shapes.qrc new file mode 100644 index 0000000000..533ba090bc --- /dev/null +++ b/examples/quick/shapes/shapes.qrc @@ -0,0 +1,31 @@ +<RCC> + <qresource prefix="/pathitem"> + <file alias="LauncherList.qml">../shared/LauncherList.qml</file> + <file alias="SimpleLauncherDelegate.qml">../shared/SimpleLauncherDelegate.qml</file> + <file alias="images/next.png">../shared/images/next.png</file> + <file alias="images/back.png">../shared/images/back.png</file> + <file alias="images/slider_handle.png">../shared/images/slider_handle.png</file> + <file alias="Slider.qml">../shared/Slider.qml</file> + <file alias="pathitem.qml">content/pathitem.qml</file> + <file alias="pathitemgallery.qml">content/pathitemgallery.qml</file> + <file alias="pathiteminteract.qml">content/pathiteminteract.qml</file> + <file alias="pathitemsampling.qml">content/pathitemsampling.qml</file> + <file alias="pathitemtigers.qml">content/pathitemtigers.qml</file> + <file alias="tiger.qml">content/tiger.qml</file> + <file alias="item1.qml">content/item1.qml</file> + <file alias="item2.qml">content/item2.qml</file> + <file alias="item4.qml">content/item4.qml</file> + <file alias="item5.qml">content/item5.qml</file> + <file alias="item6.qml">content/item6.qml</file> + <file alias="item7.qml">content/item7.qml</file> + <file alias="item8.qml">content/item8.qml</file> + <file alias="item9.qml">content/item9.qml</file> + <file alias="item10.qml">content/item10.qml</file> + <file alias="item11.qml">content/item11.qml</file> + <file alias="item12.qml">content/item12.qml</file> + <file alias="item13.qml">content/item13.qml</file> + <file alias="item14.qml">content/item14.qml</file> + <file alias="item15.qml">content/item15.qml</file> + <file alias="item17.qml">content/item17.qml</file> + </qresource> +</RCC> |