diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-12-08 17:33:19 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-12-12 14:39:36 +0100 |
| commit | 0d008bc0cd2074d8d23af71d7bac3e54ca8cf28b (patch) | |
| tree | 917c44bad023ee3f308b2f2b96c8d7d939b7241f /examples | |
| parent | dd0b82abdc6f9b055a0c0ea0b79176c861176fca (diff) | |
Fix pointer handlers example build: include piemenu, qmake support
Amends e17bfffc075202ff9ee8fba0f378f95037514740 and
8503f884bbdb50c4bebc8f8a9fce05275b0612b1 : all qml files need to be
listed in CMakeLists.txt, we need to keep qml.qrc updated too, and
we decided to keep the qmake project files.
Change-Id: Idaa4bbddabd59e79a0ae3b907319c6843d8a026a
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/pointerhandlers/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/quick/pointerhandlers/pointerhandlers.pro | 10 | ||||
| -rw-r--r-- | examples/quick/pointerhandlers/qml.qrc | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/examples/quick/pointerhandlers/CMakeLists.txt b/examples/quick/pointerhandlers/CMakeLists.txt index ca13f72420..17c49848fa 100644 --- a/examples/quick/pointerhandlers/CMakeLists.txt +++ b/examples/quick/pointerhandlers/CMakeLists.txt @@ -40,6 +40,7 @@ qt_add_qml_module(pointerhandlersexample "components/LeftDrawer.qml" "components/MomentumAnimation.qml" "components/MouseFeedbackSprite.qml" + "components/QuadPieMenu.qml" "components/ScrollBar.qml" "components/Slider.qml" "components/TouchpointFeedbackSprite.qml" @@ -49,6 +50,7 @@ qt_add_qml_module(pointerhandlersexample "map.qml" "mixer.qml" "multibuttons.qml" + "pieMenu.qml" "pinchHandler.qml" "pointerhandlers.qml" "sidebar.qml" diff --git a/examples/quick/pointerhandlers/pointerhandlers.pro b/examples/quick/pointerhandlers/pointerhandlers.pro new file mode 100644 index 0000000000..ae557f778a --- /dev/null +++ b/examples/quick/pointerhandlers/pointerhandlers.pro @@ -0,0 +1,10 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp +RESOURCES += \ + qml.qrc \ + ../shared/shared.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/pointerhandlers +INSTALLS += target diff --git a/examples/quick/pointerhandlers/qml.qrc b/examples/quick/pointerhandlers/qml.qrc index 95c9fe28c8..e9a39bc50c 100644 --- a/examples/quick/pointerhandlers/qml.qrc +++ b/examples/quick/pointerhandlers/qml.qrc @@ -2,14 +2,12 @@ <qresource prefix="/pointerhandlers"> <file>flingAnimation.qml</file> <file>fakeFlickable.qml</file> - <file>flickablesWithHandlers.qml</file> <file>joystick.qml</file> <file>map.qml</file> <file>mixer.qml</file> <file>multibuttons.qml</file> - <file>photosurface.qml</file> + <file>pieMenu.qml</file> <file>pinchHandler.qml</file> - <file>pointerDrag.qml</file> <file>pointerhandlers.qml</file> <file>singlePointHandlerProperties.qml</file> <file>sidebar.qml</file> @@ -21,6 +19,8 @@ <file>components/FlashAnimation.qml</file> <file>components/LeftDrawer.qml</file> <file>components/MomentumAnimation.qml</file> + <file>components/MouseFeedbackSprite.qml</file> + <file>components/QuadPieMenu.qml</file> <file>components/ScrollBar.qml</file> <file>components/Slider.qml</file> <file>components/TouchpointFeedbackSprite.qml</file> |