diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /tests/manual/pointer/qml.qrc | |
parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'tests/manual/pointer/qml.qrc')
-rw-r--r-- | tests/manual/pointer/qml.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/manual/pointer/qml.qrc b/tests/manual/pointer/qml.qrc index 95bece180a..20956fcbac 100644 --- a/tests/manual/pointer/qml.qrc +++ b/tests/manual/pointer/qml.qrc @@ -13,6 +13,7 @@ <file>pointerDrag.qml</file> <file>singlePointHandlerProperties.qml</file> <file>sidebar.qml</file> + <file>tabletCanvasDrawing.qml</file> <file>tapHandler.qml</file> <file>content/CheckBox.qml</file> <file>content/FakeFlickable.qml</file> @@ -30,6 +31,10 @@ <file>content/TouchpointFeedbackSprite.qml</file> <file>resources/arrowhead.png</file> <file>resources/balloon.png</file> + <file>resources/cursor-airbrush.png</file> + <file>resources/cursor-eraser.png</file> + <file>resources/cursor-felt-marker.png</file> + <file>resources/cursor-pencil.png</file> <file>resources/fighter.png</file> <file>resources/fingersprite.png</file> <file>resources/grabbing-location.svg</file> |