diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
| commit | caded2edf69e8a60897653ace1e10b72199c7427 (patch) | |
| tree | 1b28cd7578195ca3d7e14c83ccf181adbe2476ec /examples/bluetooth | |
| parent | 9677182c07b22f5f1f4fdff3f1fce6a28f76b662 (diff) | |
| parent | 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/nfc/corkboard/corkboard.pro
Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
Diffstat (limited to 'examples/bluetooth')
| -rw-r--r-- | examples/bluetooth/chat/chat.pro | 3 | ||||
| -rw-r--r-- | examples/bluetooth/picturetransfer/picturetransfer.pro | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/examples/bluetooth/chat/chat.pro b/examples/bluetooth/chat/chat.pro index 5cf6ab9f..7bc5c8bd 100644 --- a/examples/bluetooth/chat/chat.pro +++ b/examples/bluetooth/chat/chat.pro @@ -14,3 +14,6 @@ OTHER_FILES += \ Button.qml #DEFINES += QMLJSDEBUGGER + +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/chat +INSTALLS += target diff --git a/examples/bluetooth/picturetransfer/picturetransfer.pro b/examples/bluetooth/picturetransfer/picturetransfer.pro index 0eee46a2..077673e9 100644 --- a/examples/bluetooth/picturetransfer/picturetransfer.pro +++ b/examples/bluetooth/picturetransfer/picturetransfer.pro @@ -21,5 +21,8 @@ SOURCES += \ filetransfer.cpp \ main.cpp +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/picturetransfer +INSTALLS += target - +EXAMPLE_FILES += \ + icon.png |