diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
| commit | 5b548aa2ffe648810c487ecb895631da2be12a33 (patch) | |
| tree | a7e28e882d7bf2a0148708d845deddbedaf1f1f8 /src/bluetooth | |
| parent | 0690d4801ca5ee92d5e7511d48d95786212d5fb3 (diff) | |
| parent | 2526f2c4f5a22d0d69bf6c96fedfd709e479b246 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/doc/qtbluetooth.qdocconf | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothtransfermanager.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index a4b86e95..52061d7e 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -4,7 +4,7 @@ project = QtBluetooth description = Qt Bluetooth Reference Documentation version = $QT_VERSION -examplesinstallpath = qtconnectivity/bluetooth +examplesinstallpath = bluetooth qhp.projects = QtBluetooth diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index d83731c2..b1cbdae5 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -279,7 +279,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startLowEnergyScan() if (!leScanTimeout) { leScanTimeout = new QTimer(this); leScanTimeout->setSingleShot(true); - leScanTimeout->setInterval(10000); + leScanTimeout->setInterval(25000); connect(leScanTimeout, &QTimer::timeout, this, &QBluetoothDeviceDiscoveryAgentPrivate::stopLowEnergyScan); } diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index f4720564..7206dce6 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -45,8 +45,10 @@ #elif QT_OSX_BLUETOOTH #include "qbluetoothtransferreply_osx_p.h" #else +#if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH) #include "dummy/dummy_helper_p.h" #endif +#endif QT_BEGIN_NAMESPACE |