diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/multitouch/dials/dials.pro | 2 | ||||
-rw-r--r-- | examples/multitouch/knobs/knobs.pro | 2 | ||||
-rw-r--r-- | examples/multitouch/pinchzoom/images/cheese.jpg | bin | 3029 -> 0 bytes | |||
-rw-r--r-- | examples/touch/dials/dials.pro | 8 | ||||
-rw-r--r-- | examples/touch/dials/dials.ui (renamed from examples/multitouch/dials/dials.ui) | 0 | ||||
-rw-r--r-- | examples/touch/dials/main.cpp (renamed from examples/multitouch/dials/main.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/fingerpaint/fingerpaint.pro (renamed from examples/multitouch/fingerpaint/fingerpaint.pro) | 4 | ||||
-rw-r--r-- | examples/touch/fingerpaint/main.cpp (renamed from examples/multitouch/fingerpaint/main.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/fingerpaint/mainwindow.cpp (renamed from examples/multitouch/fingerpaint/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/fingerpaint/mainwindow.h (renamed from examples/multitouch/fingerpaint/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/touch/fingerpaint/scribblearea.cpp (renamed from examples/multitouch/fingerpaint/scribblearea.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/fingerpaint/scribblearea.h (renamed from examples/multitouch/fingerpaint/scribblearea.h) | 0 | ||||
-rw-r--r-- | examples/touch/knobs/knob.cpp (renamed from examples/multitouch/knobs/knob.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/knobs/knob.h (renamed from examples/multitouch/knobs/knob.h) | 0 | ||||
-rw-r--r-- | examples/touch/knobs/knobs.pro | 8 | ||||
-rw-r--r-- | examples/touch/knobs/main.cpp (renamed from examples/multitouch/knobs/main.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/graphicsview.cpp (renamed from examples/multitouch/pinchzoom/graphicsview.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/graphicsview.h (renamed from examples/multitouch/pinchzoom/graphicsview.h) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/main.cpp (renamed from examples/multitouch/pinchzoom/main.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/mice.qrc (renamed from examples/multitouch/pinchzoom/mice.qrc) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/mouse.cpp (renamed from examples/multitouch/pinchzoom/mouse.cpp) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/mouse.h (renamed from examples/multitouch/pinchzoom/mouse.h) | 0 | ||||
-rw-r--r-- | examples/touch/pinchzoom/pinchzoom.pro (renamed from examples/multitouch/pinchzoom/pinchzoom.pro) | 4 | ||||
-rw-r--r-- | examples/touch/touch.pro (renamed from examples/multitouch/multitouch.pro) | 0 |
25 files changed, 21 insertions, 9 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 9a83216..1fdd774 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -26,7 +26,7 @@ SUBDIRS = \ tutorials \ widgets \ uitools \ - multitouch \ + touch \ gestures } diff --git a/examples/multitouch/dials/dials.pro b/examples/multitouch/dials/dials.pro deleted file mode 100644 index e592232..0000000 --- a/examples/multitouch/dials/dials.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += main.cpp -FORMS += dials.ui diff --git a/examples/multitouch/knobs/knobs.pro b/examples/multitouch/knobs/knobs.pro deleted file mode 100644 index 90f0ba5..0000000 --- a/examples/multitouch/knobs/knobs.pro +++ /dev/null @@ -1,2 +0,0 @@ -HEADERS = knob.h -SOURCES = main.cpp knob.cpp diff --git a/examples/multitouch/pinchzoom/images/cheese.jpg b/examples/multitouch/pinchzoom/images/cheese.jpg Binary files differdeleted file mode 100644 index dea5795..0000000 --- a/examples/multitouch/pinchzoom/images/cheese.jpg +++ /dev/null diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro new file mode 100644 index 0000000..8963153 --- /dev/null +++ b/examples/touch/dials/dials.pro @@ -0,0 +1,8 @@ +SOURCES += main.cpp +FORMS += dials.ui + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dials.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/dials +INSTALLS += target sources diff --git a/examples/multitouch/dials/dials.ui b/examples/touch/dials/dials.ui index 8ca7ae9..8ca7ae9 100644 --- a/examples/multitouch/dials/dials.ui +++ b/examples/touch/dials/dials.ui diff --git a/examples/multitouch/dials/main.cpp b/examples/touch/dials/main.cpp index 4c7cc1e..4c7cc1e 100644 --- a/examples/multitouch/dials/main.cpp +++ b/examples/touch/dials/main.cpp diff --git a/examples/multitouch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro index 1d45635..f1c9d4c 100644 --- a/examples/multitouch/fingerpaint/fingerpaint.pro +++ b/examples/touch/fingerpaint/fingerpaint.pro @@ -5,7 +5,7 @@ SOURCES = main.cpp \ scribblearea.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint +target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint INSTALLS += target sources diff --git a/examples/multitouch/fingerpaint/main.cpp b/examples/touch/fingerpaint/main.cpp index 1d9b61d..1d9b61d 100644 --- a/examples/multitouch/fingerpaint/main.cpp +++ b/examples/touch/fingerpaint/main.cpp diff --git a/examples/multitouch/fingerpaint/mainwindow.cpp b/examples/touch/fingerpaint/mainwindow.cpp index ec42da3..ec42da3 100644 --- a/examples/multitouch/fingerpaint/mainwindow.cpp +++ b/examples/touch/fingerpaint/mainwindow.cpp diff --git a/examples/multitouch/fingerpaint/mainwindow.h b/examples/touch/fingerpaint/mainwindow.h index 714748e..714748e 100644 --- a/examples/multitouch/fingerpaint/mainwindow.h +++ b/examples/touch/fingerpaint/mainwindow.h diff --git a/examples/multitouch/fingerpaint/scribblearea.cpp b/examples/touch/fingerpaint/scribblearea.cpp index f16c334..f16c334 100644 --- a/examples/multitouch/fingerpaint/scribblearea.cpp +++ b/examples/touch/fingerpaint/scribblearea.cpp diff --git a/examples/multitouch/fingerpaint/scribblearea.h b/examples/touch/fingerpaint/scribblearea.h index 2e4fbda..2e4fbda 100644 --- a/examples/multitouch/fingerpaint/scribblearea.h +++ b/examples/touch/fingerpaint/scribblearea.h diff --git a/examples/multitouch/knobs/knob.cpp b/examples/touch/knobs/knob.cpp index 6ddd9b3..6ddd9b3 100644 --- a/examples/multitouch/knobs/knob.cpp +++ b/examples/touch/knobs/knob.cpp diff --git a/examples/multitouch/knobs/knob.h b/examples/touch/knobs/knob.h index d4e8730..d4e8730 100644 --- a/examples/multitouch/knobs/knob.h +++ b/examples/touch/knobs/knob.h diff --git a/examples/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro new file mode 100644 index 0000000..ef01c9a --- /dev/null +++ b/examples/touch/knobs/knobs.pro @@ -0,0 +1,8 @@ +HEADERS = knob.h +SOURCES = main.cpp knob.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS knobs.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs +INSTALLS += target sources diff --git a/examples/multitouch/knobs/main.cpp b/examples/touch/knobs/main.cpp index 0866f78..0866f78 100644 --- a/examples/multitouch/knobs/main.cpp +++ b/examples/touch/knobs/main.cpp diff --git a/examples/multitouch/pinchzoom/graphicsview.cpp b/examples/touch/pinchzoom/graphicsview.cpp index 041e494..041e494 100644 --- a/examples/multitouch/pinchzoom/graphicsview.cpp +++ b/examples/touch/pinchzoom/graphicsview.cpp diff --git a/examples/multitouch/pinchzoom/graphicsview.h b/examples/touch/pinchzoom/graphicsview.h index c762786..c762786 100644 --- a/examples/multitouch/pinchzoom/graphicsview.h +++ b/examples/touch/pinchzoom/graphicsview.h diff --git a/examples/multitouch/pinchzoom/main.cpp b/examples/touch/pinchzoom/main.cpp index 8abc993..8abc993 100644 --- a/examples/multitouch/pinchzoom/main.cpp +++ b/examples/touch/pinchzoom/main.cpp diff --git a/examples/multitouch/pinchzoom/mice.qrc b/examples/touch/pinchzoom/mice.qrc index accdb4d..accdb4d 100644 --- a/examples/multitouch/pinchzoom/mice.qrc +++ b/examples/touch/pinchzoom/mice.qrc diff --git a/examples/multitouch/pinchzoom/mouse.cpp b/examples/touch/pinchzoom/mouse.cpp index 82617fe..82617fe 100644 --- a/examples/multitouch/pinchzoom/mouse.cpp +++ b/examples/touch/pinchzoom/mouse.cpp diff --git a/examples/multitouch/pinchzoom/mouse.h b/examples/touch/pinchzoom/mouse.h index 241f8ab..241f8ab 100644 --- a/examples/multitouch/pinchzoom/mouse.h +++ b/examples/touch/pinchzoom/mouse.h diff --git a/examples/multitouch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro index bd87cf7..804536b 100644 --- a/examples/multitouch/pinchzoom/pinchzoom.pro +++ b/examples/touch/pinchzoom/pinchzoom.pro @@ -10,7 +10,7 @@ RESOURCES += \ mice.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom +target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom INSTALLS += target sources diff --git a/examples/multitouch/multitouch.pro b/examples/touch/touch.pro index d5983eb..d5983eb 100644 --- a/examples/multitouch/multitouch.pro +++ b/examples/touch/touch.pro |