diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
| commit | f334ea4b196950c4074e7513626aabeef3d99d7f (patch) | |
| tree | ccb07d59afbb60a92b80a061645c8013aab9b96c /examples/bluetooth/bluetooth.pro | |
| parent | 3910d9ffcc11db7b3beb7f2b6f0c1754103cfacb (diff) | |
| parent | 552f1a164d627720942414915fb56ae7d3b7ef22 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/bluez/bluez.pri
src/bluetooth/doc/src/bluetooth-index.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothdeviceinfo.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
Diffstat (limited to 'examples/bluetooth/bluetooth.pro')
| -rw-r--r-- | examples/bluetooth/bluetooth.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro index f7fe9d20..4576956f 100644 --- a/examples/bluetooth/bluetooth.pro +++ b/examples/bluetooth/bluetooth.pro @@ -2,11 +2,11 @@ TEMPLATE = subdirs qtHaveModule(widgets) { SUBDIRS += btchat \ btscanner \ - btfiletransfer \ - bttennis + btfiletransfer } qtHaveModule(quick): SUBDIRS += scanner \ picturetransfer \ + pingpong \ lowenergyscanner \ heartlistener |