diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:02:22 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:02:22 +0100 |
commit | 9adda0a194e10b39ccfadb208309e91ac02c9cae (patch) | |
tree | 6c289bfa89298bb018ac406671e3d3f53397e1bf | |
parent | 00f37af66bd819a232d65e24fe120c12cddf3240 (diff) | |
parent | 6a07037765ea7c195e802472106448432a91ec78 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I41358c93240ae922f8493f6d55a5bffcfb06bc79
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | examples/bluetooth/btchat/btchat.pro | 3 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/btfiletransfer.pro | 3 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/btscanner.pro | 2 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/bttennis.pro | 6 | ||||
-rw-r--r-- | examples/bluetooth/scanner/scanner.pro | 8 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.pro | 2 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/ndefeditor.pro | 3 | ||||
-rw-r--r-- | examples/nfc/poster/poster.pro | 3 |
9 files changed, 28 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 16328b7d..efd0e68f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,4 @@ load(qt_build_config) +CONFIG += qt_example_installs MODULE_VERSION = 5.3.0 diff --git a/examples/bluetooth/btchat/btchat.pro b/examples/bluetooth/btchat/btchat.pro index 6d6a928b..08fdd4a7 100644 --- a/examples/bluetooth/btchat/btchat.pro +++ b/examples/bluetooth/btchat/btchat.pro @@ -19,3 +19,6 @@ HEADERS = \ FORMS = \ chat.ui \ remoteselector.ui + +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/btchat +INSTALLS += target diff --git a/examples/bluetooth/btfiletransfer/btfiletransfer.pro b/examples/bluetooth/btfiletransfer/btfiletransfer.pro index 58d4e638..00b16415 100644 --- a/examples/bluetooth/btfiletransfer/btfiletransfer.pro +++ b/examples/bluetooth/btfiletransfer/btfiletransfer.pro @@ -25,3 +25,6 @@ OTHER_FILES += \ RESOURCES += \ btfiletransfer.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/scanner +INSTALLS += target diff --git a/examples/bluetooth/btscanner/btscanner.pro b/examples/bluetooth/btscanner/btscanner.pro index 81d83cae..f1254629 100644 --- a/examples/bluetooth/btscanner/btscanner.pro +++ b/examples/bluetooth/btscanner/btscanner.pro @@ -16,3 +16,5 @@ FORMS = \ device.ui \ service.ui +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/btscanner +INSTALLS += target diff --git a/examples/bluetooth/bttennis/bttennis.pro b/examples/bluetooth/bttennis/bttennis.pro index 878795da..1c014784 100644 --- a/examples/bluetooth/bttennis/bttennis.pro +++ b/examples/bluetooth/bttennis/bttennis.pro @@ -28,3 +28,9 @@ FORMS = \ RESOURCES += \ tennis.qrc + +OTHER_FILES = \ + connect.png + +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/bttennis +INSTALLS += target diff --git a/examples/bluetooth/scanner/scanner.pro b/examples/bluetooth/scanner/scanner.pro index 7e5c00f7..68572533 100644 --- a/examples/bluetooth/scanner/scanner.pro +++ b/examples/bluetooth/scanner/scanner.pro @@ -8,9 +8,11 @@ RESOURCES += \ scanner.qrc OTHER_FILES += \ - scanner.qml + scanner.qml \ + Button.qml \ + default.png #DEFINES += QMLJSDEBUGGER -OTHER_FILES += \ - Button.qml +target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/scanner +INSTALLS += target diff --git a/examples/nfc/annotatedurl/annotatedurl.pro b/examples/nfc/annotatedurl/annotatedurl.pro index 65ed7c8d..e2bb7c06 100644 --- a/examples/nfc/annotatedurl/annotatedurl.pro +++ b/examples/nfc/annotatedurl/annotatedurl.pro @@ -13,3 +13,5 @@ HEADERS += mainwindow.h \ FORMS += mainwindow.ui +target.path = $$[QT_INSTALL_EXAMPLES]/nfc/annotatedurl +INSTALLS += target diff --git a/examples/nfc/ndefeditor/ndefeditor.pro b/examples/nfc/ndefeditor/ndefeditor.pro index 47971fdb..43ab47fa 100644 --- a/examples/nfc/ndefeditor/ndefeditor.pro +++ b/examples/nfc/ndefeditor/ndefeditor.pro @@ -21,3 +21,6 @@ FORMS += \ textrecordeditor.ui \ urirecordeditor.ui \ mimeimagerecordeditor.ui + +target.path = $$[QT_INSTALL_EXAMPLES]/nfc/ndefeditor +INSTALLS += target diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro index d108b2a2..47de2986 100644 --- a/examples/nfc/poster/poster.pro +++ b/examples/nfc/poster/poster.pro @@ -11,3 +11,6 @@ RESOURCES += \ OTHER_FILES += \ poster.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/nfc/poster +INSTALLS += target |