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.pro | |
| 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.pro')
| -rw-r--r-- | examples/quick/shapes/shapes.pro | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/examples/quick/shapes/shapes.pro b/examples/quick/shapes/shapes.pro new file mode 100644 index 0000000000..1b953f56ca --- /dev/null +++ b/examples/quick/shapes/shapes.pro @@ -0,0 +1,29 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp +RESOURCES += shapes.qrc +OTHER_FILES += content/pathitem.qml \ + content/pathitemgallery.qml \ + content/pathiteminteract.qml \ + content/pathitemsampling.qml \ + content/pathitemtigers.qml \ + content/tiger.qml \ + content/item1.qml \ + content/item2.qml \ + content/item4.qml \ + content/item5.qml \ + content/item6.qml \ + content/item7.qml \ + content/item8.qml \ + content/item9.qml \ + content/item10.qml \ + content/item11.qml \ + content/item12.qml \ + content/item13.qml \ + content/item14.qml \ + content/item15.qml \ + content/item17.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/shapes +INSTALLS += target |