diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-05-13 15:11:30 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-24 11:52:39 +0000 |
commit | eaf8a9800e81a446e9badaa32be459d0a54ec9b5 (patch) | |
tree | 2d848c5376bd6b874a0071dfa6def76e30f2d91e | |
parent | 84b87c222872eb6e49727d773177b7f5b86e9beb (diff) |
Deploy examples to the standard examples directoryv5.7.0-rc1
Examples were using the default Qt Creator generated deployment
include which does not have the correct target paths.
Task-number: QTBUG-51918
Change-Id: I6d217c6964c2cdab852ea1067bd0adcb6f34534a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r-- | examples/configureButtons/deployment.pri | 14 | ||||
-rw-r--r-- | examples/examples.pro | 13 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/android/AndroidManifest.xml (renamed from examples/configureButtons/android/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/configureButtons.pro (renamed from examples/configureButtons/configureButtons.pro) | 4 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/doc/images/configuregamepadbuttons-example.png (renamed from examples/configureButtons/doc/images/configuregamepadbuttons-example.png) | bin | 20239 -> 20239 bytes | |||
-rw-r--r-- | examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc (renamed from examples/configureButtons/doc/src/configbuttonsexample.qdoc) | 0 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/main.cpp (renamed from examples/configureButtons/main.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/main.qml (renamed from examples/configureButtons/main.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/configureButtons/qml.qrc (renamed from examples/configureButtons/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/gamepad/gamepad.pro | 13 | ||||
-rw-r--r-- | examples/gamepad/keyNavigation/doc/images/keynavigationgamepad-example.png (renamed from examples/keyNavigation/doc/images/keynavigationgamepad-example.png) | bin | 3812 -> 3812 bytes | |||
-rw-r--r-- | examples/gamepad/keyNavigation/doc/src/keynaviexample.qdoc (renamed from examples/keyNavigation/doc/src/keynaviexample.qdoc) | 0 | ||||
-rw-r--r-- | examples/gamepad/keyNavigation/keyNavigation.pro (renamed from examples/keyNavigation/keyNavigation.pro) | 4 | ||||
-rw-r--r-- | examples/gamepad/keyNavigation/keyNavigation64.png (renamed from examples/keyNavigation/keyNavigation64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/gamepad/keyNavigation/keyNavigation80.png (renamed from examples/keyNavigation/keyNavigation80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/gamepad/keyNavigation/main.cpp (renamed from examples/keyNavigation/main.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/keyNavigation/qml.qrc (renamed from examples/keyNavigation/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/gamepad/keyNavigation/qml/main.qml (renamed from examples/keyNavigation/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/mouseItem/doc/src/mouseitemexample.qdoc (renamed from examples/mouseItem/doc/src/mouseitemexample.qdoc) | 0 | ||||
-rw-r--r-- | examples/gamepad/mouseItem/main.cpp (renamed from examples/mouseItem/main.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/mouseItem/mouseItem.pro (renamed from examples/mouseItem/mouseItem.pro) | 4 | ||||
-rw-r--r-- | examples/gamepad/mouseItem/mouseItem64.png (renamed from examples/mouseItem/mouseItem64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/gamepad/mouseItem/mouseItem80.png (renamed from examples/mouseItem/mouseItem80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/gamepad/mouseItem/qml.qrc (renamed from examples/mouseItem/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/gamepad/mouseItem/qml/main.qml (renamed from examples/mouseItem/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/doc/images/qtquickgamepad-example.png (renamed from examples/quickGamepad/doc/images/qtquickgamepad-example.png) | bin | 50662 -> 50662 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/doc/src/quickgamepadexample.qdoc (renamed from examples/quickGamepad/doc/src/quickgamepadexample.qdoc) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/main.cpp (renamed from examples/quickGamepad/main.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml.qrc (renamed from examples/quickGamepad/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/ButtonImage.qml (renamed from examples/quickGamepad/qml/ButtonImage.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/DPad.qml (renamed from examples/quickGamepad/qml/DPad.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/JoystickViewer.qml (renamed from examples/quickGamepad/qml/JoystickViewer.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/LeftThumbstick.qml (renamed from examples/quickGamepad/qml/LeftThumbstick.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/RightThumbstick.qml (renamed from examples/quickGamepad/qml/RightThumbstick.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/main.qml (renamed from examples/quickGamepad/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerBack.png (renamed from examples/quickGamepad/qml/xboxControllerBack.png) | bin | 11012 -> 11012 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerButtonA.png (renamed from examples/quickGamepad/qml/xboxControllerButtonA.png) | bin | 13764 -> 13764 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerButtonB.png (renamed from examples/quickGamepad/qml/xboxControllerButtonB.png) | bin | 13480 -> 13480 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerButtonGuide.png (renamed from examples/quickGamepad/qml/xboxControllerButtonGuide.png) | bin | 37297 -> 37297 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerButtonX.png (renamed from examples/quickGamepad/qml/xboxControllerButtonX.png) | bin | 14017 -> 14017 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerButtonY.png (renamed from examples/quickGamepad/qml/xboxControllerButtonY.png) | bin | 13911 -> 13911 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerDPad.png (renamed from examples/quickGamepad/qml/xboxControllerDPad.png) | bin | 33024 -> 33024 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerLeftShoulder.png (renamed from examples/quickGamepad/qml/xboxControllerLeftShoulder.png) | bin | 22224 -> 22224 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerLeftThumbstick.png (renamed from examples/quickGamepad/qml/xboxControllerLeftThumbstick.png) | bin | 28966 -> 28966 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerLeftTrigger.png (renamed from examples/quickGamepad/qml/xboxControllerLeftTrigger.png) | bin | 13918 -> 13918 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerRightShoulder.png (renamed from examples/quickGamepad/qml/xboxControllerRightShoulder.png) | bin | 21209 -> 21209 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerRightThumbstick.png (renamed from examples/quickGamepad/qml/xboxControllerRightThumbstick.png) | bin | 29386 -> 29386 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerRightTrigger.png (renamed from examples/quickGamepad/qml/xboxControllerRightTrigger.png) | bin | 14152 -> 14152 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/qml/xboxControllerStart.png (renamed from examples/quickGamepad/qml/xboxControllerStart.png) | bin | 11271 -> 11271 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/quickGamepad.pro (renamed from examples/quickGamepad/quickGamepad.pro) | 4 | ||||
-rw-r--r-- | examples/gamepad/quickGamepad/quickGamepad64.png (renamed from examples/quickGamepad/quickGamepad64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/gamepad/quickGamepad/quickGamepad80.png (renamed from examples/quickGamepad/quickGamepad80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/gamepad/simple/android/AndroidManifest.xml (renamed from examples/simple/android/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | examples/gamepad/simple/doc/src/simpleexample.qdoc (renamed from examples/simple/doc/src/simpleexample.qdoc) | 0 | ||||
-rw-r--r-- | examples/gamepad/simple/gamepadmonitor.cpp (renamed from examples/simple/gamepadmonitor.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/simple/gamepadmonitor.h (renamed from examples/simple/gamepadmonitor.h) | 0 | ||||
-rw-r--r-- | examples/gamepad/simple/main.cpp (renamed from examples/simple/main.cpp) | 0 | ||||
-rw-r--r-- | examples/gamepad/simple/simple.pro (renamed from examples/simple/simple.pro) | 3 | ||||
-rw-r--r-- | examples/keyNavigation/deployment.pri | 19 | ||||
-rw-r--r-- | examples/mouseItem/deployment.pri | 19 | ||||
-rw-r--r-- | examples/quickGamepad/deployment.pri | 19 |
61 files changed, 25 insertions, 91 deletions
diff --git a/examples/configureButtons/deployment.pri b/examples/configureButtons/deployment.pri deleted file mode 100644 index c89af25..0000000 --- a/examples/configureButtons/deployment.pri +++ /dev/null @@ -1,14 +0,0 @@ -unix:!android { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) - diff --git a/examples/examples.pro b/examples/examples.pro index aa36739..72acdb0 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,13 +1,2 @@ TEMPLATE = subdirs - -SUBDIRS += simple - -qtHaveModule(quick) { - SUBDIRS += configureButtons - - qtHaveModule(widgets) { - SUBDIRS += quickGamepad \ - keyNavigation \ - mouseItem - } -} +SUBDIRS += gamepad diff --git a/examples/configureButtons/android/AndroidManifest.xml b/examples/gamepad/configureButtons/android/AndroidManifest.xml index 60f64fb..60f64fb 100644 --- a/examples/configureButtons/android/AndroidManifest.xml +++ b/examples/gamepad/configureButtons/android/AndroidManifest.xml diff --git a/examples/configureButtons/configureButtons.pro b/examples/gamepad/configureButtons/configureButtons.pro index 480f8fb..89d6da0 100644 --- a/examples/configureButtons/configureButtons.pro +++ b/examples/gamepad/configureButtons/configureButtons.pro @@ -9,8 +9,8 @@ RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = -# Default rules for deployment. -include(deployment.pri) +target.path = $$[QT_INSTALL_EXAMPLES]/gamepad/configureButtons +INSTALLS += target DISTFILES += \ android/AndroidManifest.xml diff --git a/examples/configureButtons/doc/images/configuregamepadbuttons-example.png b/examples/gamepad/configureButtons/doc/images/configuregamepadbuttons-example.png Binary files differindex 408f7a6..408f7a6 100644 --- a/examples/configureButtons/doc/images/configuregamepadbuttons-example.png +++ b/examples/gamepad/configureButtons/doc/images/configuregamepadbuttons-example.png diff --git a/examples/configureButtons/doc/src/configbuttonsexample.qdoc b/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc index c2c0517..c2c0517 100644 --- a/examples/configureButtons/doc/src/configbuttonsexample.qdoc +++ b/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc diff --git a/examples/configureButtons/main.cpp b/examples/gamepad/configureButtons/main.cpp index f02932b..f02932b 100644 --- a/examples/configureButtons/main.cpp +++ b/examples/gamepad/configureButtons/main.cpp diff --git a/examples/configureButtons/main.qml b/examples/gamepad/configureButtons/main.qml index c93ddf2..c93ddf2 100644 --- a/examples/configureButtons/main.qml +++ b/examples/gamepad/configureButtons/main.qml diff --git a/examples/configureButtons/qml.qrc b/examples/gamepad/configureButtons/qml.qrc index 5f6483a..5f6483a 100644 --- a/examples/configureButtons/qml.qrc +++ b/examples/gamepad/configureButtons/qml.qrc diff --git a/examples/gamepad/gamepad.pro b/examples/gamepad/gamepad.pro new file mode 100644 index 0000000..aa36739 --- /dev/null +++ b/examples/gamepad/gamepad.pro @@ -0,0 +1,13 @@ +TEMPLATE = subdirs + +SUBDIRS += simple + +qtHaveModule(quick) { + SUBDIRS += configureButtons + + qtHaveModule(widgets) { + SUBDIRS += quickGamepad \ + keyNavigation \ + mouseItem + } +} diff --git a/examples/keyNavigation/doc/images/keynavigationgamepad-example.png b/examples/gamepad/keyNavigation/doc/images/keynavigationgamepad-example.png Binary files differindex fa2fa1c..fa2fa1c 100644 --- a/examples/keyNavigation/doc/images/keynavigationgamepad-example.png +++ b/examples/gamepad/keyNavigation/doc/images/keynavigationgamepad-example.png diff --git a/examples/keyNavigation/doc/src/keynaviexample.qdoc b/examples/gamepad/keyNavigation/doc/src/keynaviexample.qdoc index 4226438..4226438 100644 --- a/examples/keyNavigation/doc/src/keynaviexample.qdoc +++ b/examples/gamepad/keyNavigation/doc/src/keynaviexample.qdoc diff --git a/examples/keyNavigation/keyNavigation.pro b/examples/gamepad/keyNavigation/keyNavigation.pro index 1cdc565..6091e39 100644 --- a/examples/keyNavigation/keyNavigation.pro +++ b/examples/gamepad/keyNavigation/keyNavigation.pro @@ -9,5 +9,5 @@ RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = -# Default rules for deployment. -include(deployment.pri) +target.path = $$[QT_INSTALL_EXAMPLES]/gamepad/keyNavigation +INSTALLS += target diff --git a/examples/keyNavigation/keyNavigation64.png b/examples/gamepad/keyNavigation/keyNavigation64.png Binary files differindex 707d5c4..707d5c4 100644 --- a/examples/keyNavigation/keyNavigation64.png +++ b/examples/gamepad/keyNavigation/keyNavigation64.png diff --git a/examples/keyNavigation/keyNavigation80.png b/examples/gamepad/keyNavigation/keyNavigation80.png Binary files differindex 6ad8096..6ad8096 100644 --- a/examples/keyNavigation/keyNavigation80.png +++ b/examples/gamepad/keyNavigation/keyNavigation80.png diff --git a/examples/keyNavigation/main.cpp b/examples/gamepad/keyNavigation/main.cpp index 188b215..188b215 100644 --- a/examples/keyNavigation/main.cpp +++ b/examples/gamepad/keyNavigation/main.cpp diff --git a/examples/keyNavigation/qml.qrc b/examples/gamepad/keyNavigation/qml.qrc index 69145a8..69145a8 100644 --- a/examples/keyNavigation/qml.qrc +++ b/examples/gamepad/keyNavigation/qml.qrc diff --git a/examples/keyNavigation/qml/main.qml b/examples/gamepad/keyNavigation/qml/main.qml index d58bfc5..d58bfc5 100644 --- a/examples/keyNavigation/qml/main.qml +++ b/examples/gamepad/keyNavigation/qml/main.qml diff --git a/examples/mouseItem/doc/src/mouseitemexample.qdoc b/examples/gamepad/mouseItem/doc/src/mouseitemexample.qdoc index 80f8357..80f8357 100644 --- a/examples/mouseItem/doc/src/mouseitemexample.qdoc +++ b/examples/gamepad/mouseItem/doc/src/mouseitemexample.qdoc diff --git a/examples/mouseItem/main.cpp b/examples/gamepad/mouseItem/main.cpp index ab95334..ab95334 100644 --- a/examples/mouseItem/main.cpp +++ b/examples/gamepad/mouseItem/main.cpp diff --git a/examples/mouseItem/mouseItem.pro b/examples/gamepad/mouseItem/mouseItem.pro index 1cdc565..05f1c2c 100644 --- a/examples/mouseItem/mouseItem.pro +++ b/examples/gamepad/mouseItem/mouseItem.pro @@ -9,5 +9,5 @@ RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = -# Default rules for deployment. -include(deployment.pri) +target.path = $$[QT_INSTALL_EXAMPLES]/gamepad/mouseItem +INSTALLS += target diff --git a/examples/mouseItem/mouseItem64.png b/examples/gamepad/mouseItem/mouseItem64.png Binary files differindex 707d5c4..707d5c4 100644 --- a/examples/mouseItem/mouseItem64.png +++ b/examples/gamepad/mouseItem/mouseItem64.png diff --git a/examples/mouseItem/mouseItem80.png b/examples/gamepad/mouseItem/mouseItem80.png Binary files differindex 6ad8096..6ad8096 100644 --- a/examples/mouseItem/mouseItem80.png +++ b/examples/gamepad/mouseItem/mouseItem80.png diff --git a/examples/mouseItem/qml.qrc b/examples/gamepad/mouseItem/qml.qrc index 69145a8..69145a8 100644 --- a/examples/mouseItem/qml.qrc +++ b/examples/gamepad/mouseItem/qml.qrc diff --git a/examples/mouseItem/qml/main.qml b/examples/gamepad/mouseItem/qml/main.qml index 4c05e90..4c05e90 100644 --- a/examples/mouseItem/qml/main.qml +++ b/examples/gamepad/mouseItem/qml/main.qml diff --git a/examples/quickGamepad/doc/images/qtquickgamepad-example.png b/examples/gamepad/quickGamepad/doc/images/qtquickgamepad-example.png Binary files differindex 9f46e4d..9f46e4d 100644 --- a/examples/quickGamepad/doc/images/qtquickgamepad-example.png +++ b/examples/gamepad/quickGamepad/doc/images/qtquickgamepad-example.png diff --git a/examples/quickGamepad/doc/src/quickgamepadexample.qdoc b/examples/gamepad/quickGamepad/doc/src/quickgamepadexample.qdoc index b96c419..b96c419 100644 --- a/examples/quickGamepad/doc/src/quickgamepadexample.qdoc +++ b/examples/gamepad/quickGamepad/doc/src/quickgamepadexample.qdoc diff --git a/examples/quickGamepad/main.cpp b/examples/gamepad/quickGamepad/main.cpp index 188b215..188b215 100644 --- a/examples/quickGamepad/main.cpp +++ b/examples/gamepad/quickGamepad/main.cpp diff --git a/examples/quickGamepad/qml.qrc b/examples/gamepad/quickGamepad/qml.qrc index d82637e..d82637e 100644 --- a/examples/quickGamepad/qml.qrc +++ b/examples/gamepad/quickGamepad/qml.qrc diff --git a/examples/quickGamepad/qml/ButtonImage.qml b/examples/gamepad/quickGamepad/qml/ButtonImage.qml index 8057542..8057542 100644 --- a/examples/quickGamepad/qml/ButtonImage.qml +++ b/examples/gamepad/quickGamepad/qml/ButtonImage.qml diff --git a/examples/quickGamepad/qml/DPad.qml b/examples/gamepad/quickGamepad/qml/DPad.qml index d34c953..d34c953 100644 --- a/examples/quickGamepad/qml/DPad.qml +++ b/examples/gamepad/quickGamepad/qml/DPad.qml diff --git a/examples/quickGamepad/qml/JoystickViewer.qml b/examples/gamepad/quickGamepad/qml/JoystickViewer.qml index da0168e..da0168e 100644 --- a/examples/quickGamepad/qml/JoystickViewer.qml +++ b/examples/gamepad/quickGamepad/qml/JoystickViewer.qml diff --git a/examples/quickGamepad/qml/LeftThumbstick.qml b/examples/gamepad/quickGamepad/qml/LeftThumbstick.qml index 8ee0db0..8ee0db0 100644 --- a/examples/quickGamepad/qml/LeftThumbstick.qml +++ b/examples/gamepad/quickGamepad/qml/LeftThumbstick.qml diff --git a/examples/quickGamepad/qml/RightThumbstick.qml b/examples/gamepad/quickGamepad/qml/RightThumbstick.qml index 9dfa3de..9dfa3de 100644 --- a/examples/quickGamepad/qml/RightThumbstick.qml +++ b/examples/gamepad/quickGamepad/qml/RightThumbstick.qml diff --git a/examples/quickGamepad/qml/main.qml b/examples/gamepad/quickGamepad/qml/main.qml index 049e72b..049e72b 100644 --- a/examples/quickGamepad/qml/main.qml +++ b/examples/gamepad/quickGamepad/qml/main.qml diff --git a/examples/quickGamepad/qml/xboxControllerBack.png b/examples/gamepad/quickGamepad/qml/xboxControllerBack.png Binary files differindex d97972c..d97972c 100644 --- a/examples/quickGamepad/qml/xboxControllerBack.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerBack.png diff --git a/examples/quickGamepad/qml/xboxControllerButtonA.png b/examples/gamepad/quickGamepad/qml/xboxControllerButtonA.png Binary files differindex 271e8c8..271e8c8 100644 --- a/examples/quickGamepad/qml/xboxControllerButtonA.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerButtonA.png diff --git a/examples/quickGamepad/qml/xboxControllerButtonB.png b/examples/gamepad/quickGamepad/qml/xboxControllerButtonB.png Binary files differindex f1e06b6..f1e06b6 100644 --- a/examples/quickGamepad/qml/xboxControllerButtonB.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerButtonB.png diff --git a/examples/quickGamepad/qml/xboxControllerButtonGuide.png b/examples/gamepad/quickGamepad/qml/xboxControllerButtonGuide.png Binary files differindex 287d32b..287d32b 100644 --- a/examples/quickGamepad/qml/xboxControllerButtonGuide.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerButtonGuide.png diff --git a/examples/quickGamepad/qml/xboxControllerButtonX.png b/examples/gamepad/quickGamepad/qml/xboxControllerButtonX.png Binary files differindex 8d29281..8d29281 100644 --- a/examples/quickGamepad/qml/xboxControllerButtonX.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerButtonX.png diff --git a/examples/quickGamepad/qml/xboxControllerButtonY.png b/examples/gamepad/quickGamepad/qml/xboxControllerButtonY.png Binary files differindex 465ac48..465ac48 100644 --- a/examples/quickGamepad/qml/xboxControllerButtonY.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerButtonY.png diff --git a/examples/quickGamepad/qml/xboxControllerDPad.png b/examples/gamepad/quickGamepad/qml/xboxControllerDPad.png Binary files differindex efaeb16..efaeb16 100644 --- a/examples/quickGamepad/qml/xboxControllerDPad.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerDPad.png diff --git a/examples/quickGamepad/qml/xboxControllerLeftShoulder.png b/examples/gamepad/quickGamepad/qml/xboxControllerLeftShoulder.png Binary files differindex 9b084df..9b084df 100644 --- a/examples/quickGamepad/qml/xboxControllerLeftShoulder.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerLeftShoulder.png diff --git a/examples/quickGamepad/qml/xboxControllerLeftThumbstick.png b/examples/gamepad/quickGamepad/qml/xboxControllerLeftThumbstick.png Binary files differindex 08fbaa2..08fbaa2 100644 --- a/examples/quickGamepad/qml/xboxControllerLeftThumbstick.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerLeftThumbstick.png diff --git a/examples/quickGamepad/qml/xboxControllerLeftTrigger.png b/examples/gamepad/quickGamepad/qml/xboxControllerLeftTrigger.png Binary files differindex 1fd7324..1fd7324 100644 --- a/examples/quickGamepad/qml/xboxControllerLeftTrigger.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerLeftTrigger.png diff --git a/examples/quickGamepad/qml/xboxControllerRightShoulder.png b/examples/gamepad/quickGamepad/qml/xboxControllerRightShoulder.png Binary files differindex a22c8ca..a22c8ca 100644 --- a/examples/quickGamepad/qml/xboxControllerRightShoulder.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerRightShoulder.png diff --git a/examples/quickGamepad/qml/xboxControllerRightThumbstick.png b/examples/gamepad/quickGamepad/qml/xboxControllerRightThumbstick.png Binary files differindex ab95ef5..ab95ef5 100644 --- a/examples/quickGamepad/qml/xboxControllerRightThumbstick.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerRightThumbstick.png diff --git a/examples/quickGamepad/qml/xboxControllerRightTrigger.png b/examples/gamepad/quickGamepad/qml/xboxControllerRightTrigger.png Binary files differindex 717f7ab..717f7ab 100644 --- a/examples/quickGamepad/qml/xboxControllerRightTrigger.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerRightTrigger.png diff --git a/examples/quickGamepad/qml/xboxControllerStart.png b/examples/gamepad/quickGamepad/qml/xboxControllerStart.png Binary files differindex 709459e..709459e 100644 --- a/examples/quickGamepad/qml/xboxControllerStart.png +++ b/examples/gamepad/quickGamepad/qml/xboxControllerStart.png diff --git a/examples/quickGamepad/quickGamepad.pro b/examples/gamepad/quickGamepad/quickGamepad.pro index 1cdc565..a310dc9 100644 --- a/examples/quickGamepad/quickGamepad.pro +++ b/examples/gamepad/quickGamepad/quickGamepad.pro @@ -9,5 +9,5 @@ RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = -# Default rules for deployment. -include(deployment.pri) +target.path = $$[QT_INSTALL_EXAMPLES]/gamepad/quickGamepad +INSTALLS += target diff --git a/examples/quickGamepad/quickGamepad64.png b/examples/gamepad/quickGamepad/quickGamepad64.png Binary files differindex 707d5c4..707d5c4 100644 --- a/examples/quickGamepad/quickGamepad64.png +++ b/examples/gamepad/quickGamepad/quickGamepad64.png diff --git a/examples/quickGamepad/quickGamepad80.png b/examples/gamepad/quickGamepad/quickGamepad80.png Binary files differindex 6ad8096..6ad8096 100644 --- a/examples/quickGamepad/quickGamepad80.png +++ b/examples/gamepad/quickGamepad/quickGamepad80.png diff --git a/examples/simple/android/AndroidManifest.xml b/examples/gamepad/simple/android/AndroidManifest.xml index bdf824d..bdf824d 100644 --- a/examples/simple/android/AndroidManifest.xml +++ b/examples/gamepad/simple/android/AndroidManifest.xml diff --git a/examples/simple/doc/src/simpleexample.qdoc b/examples/gamepad/simple/doc/src/simpleexample.qdoc index 67bb07b..67bb07b 100644 --- a/examples/simple/doc/src/simpleexample.qdoc +++ b/examples/gamepad/simple/doc/src/simpleexample.qdoc diff --git a/examples/simple/gamepadmonitor.cpp b/examples/gamepad/simple/gamepadmonitor.cpp index d77b7a7..d77b7a7 100644 --- a/examples/simple/gamepadmonitor.cpp +++ b/examples/gamepad/simple/gamepadmonitor.cpp diff --git a/examples/simple/gamepadmonitor.h b/examples/gamepad/simple/gamepadmonitor.h index 8c3fb4a..8c3fb4a 100644 --- a/examples/simple/gamepadmonitor.h +++ b/examples/gamepad/simple/gamepadmonitor.h diff --git a/examples/simple/main.cpp b/examples/gamepad/simple/main.cpp index 3bb4818..3bb4818 100644 --- a/examples/simple/main.cpp +++ b/examples/gamepad/simple/main.cpp diff --git a/examples/simple/simple.pro b/examples/gamepad/simple/simple.pro index 5db564f..1fde59e 100644 --- a/examples/simple/simple.pro +++ b/examples/gamepad/simple/simple.pro @@ -12,3 +12,6 @@ DISTFILES += \ android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + +target.path = $$[QT_INSTALL_EXAMPLES]/gamepad/simple +INSTALLS += target diff --git a/examples/keyNavigation/deployment.pri b/examples/keyNavigation/deployment.pri deleted file mode 100644 index 0d58a25..0000000 --- a/examples/keyNavigation/deployment.pri +++ /dev/null @@ -1,19 +0,0 @@ -android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - target.path = /opt/$${TARGET}/bin - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/examples/mouseItem/deployment.pri b/examples/mouseItem/deployment.pri deleted file mode 100644 index 0d58a25..0000000 --- a/examples/mouseItem/deployment.pri +++ /dev/null @@ -1,19 +0,0 @@ -android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - target.path = /opt/$${TARGET}/bin - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/examples/quickGamepad/deployment.pri b/examples/quickGamepad/deployment.pri deleted file mode 100644 index 0d58a25..0000000 --- a/examples/quickGamepad/deployment.pri +++ /dev/null @@ -1,19 +0,0 @@ -android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - target.path = /opt/$${TARGET}/bin - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) |