diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-12-19 16:42:19 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-12-29 13:07:14 +0100 |
| commit | 0ee4082e37cb0f23a5f5aa69fa3291d270e5b1f8 (patch) | |
| tree | 3ddedc3ab5a41ac4abd468af633ba30d880c1449 | |
| parent | fc26d456cf62263cdc6040e97ef79b7b40b67339 (diff) | |
| download | qtconnectivity-0ee4082e37cb0f23a5f5aa69fa3291d270e5b1f8.tar.gz | |
IOBluetooth (device scan) - reduce the manual timeout
Normally, we set it to 15 s. when creating inquiry instance, since Monterey
our 15 s. are ignored and we had a timer to stop the scan in 30 s. Now that
tests are runing on CI a painfully long timeout is not needed. Make it 17 s.
in case IOBluetooth will be able to stop in 15.
Change-Id: I8e07c2a3f3c46bed3780f3287e637b5324660305
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
(cherry picked from commit 24674633ecebc85f09fe8bd5babeba9abe0ee3e0)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/bluetooth/osx/osxbtdeviceinquiry.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bluetooth/osx/osxbtdeviceinquiry.mm b/src/bluetooth/osx/osxbtdeviceinquiry.mm index 5f95d617..654effdc 100644 --- a/src/bluetooth/osx/osxbtdeviceinquiry.mm +++ b/src/bluetooth/osx/osxbtdeviceinquiry.mm @@ -128,7 +128,9 @@ const uint8_t IOBlueoothInquiryLengthS = 15; }); watchDog->setSingleShot(true); - watchDog->setInterval(IOBlueoothInquiryLengthS * 2 * 1000); // Let's make it twice as long. + // Let's use 17 s. so that IOBluetooth, if it respects 'inquiryLength' + // has a chance to stop before we do: + watchDog->setInterval((IOBlueoothInquiryLengthS + 2) * 1000); watchDog->start(); } |