summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* De-duplicate device discovery code (Darwin)Timur Pocheptsov2019-06-1410-764/+184
* Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-122-4/+4
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-036-17/+102
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-036-17/+102
|/|
| * winrt: Make sure that ProtocolDescriptorList is always set for servicesOliver Wolff2019-05-271-0/+11
| * qbluetoothsocket_winrt: Use recommended service connection approach if possibleOliver Wolff2019-05-274-17/+80
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-262-0/+11
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-262-0/+11
| |/|
| | * BlueZ: Fix leaking client socket when running QLEController Peripheral modeAlex Blasche2019-05-082-0/+11
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-141-1/+2
|\| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-111-1/+2
| |\|
| | * Bluetooth: Compare the server channel when checking for duplicatesAndy Shaw2019-05-101-1/+2
* | | IO/CoreBluetooth - refactor the code a bitTimur Pocheptsov2019-05-086-3/+474
* | | Remove usage of deprecated QBluetoothServiceInfo::DataCompleteAlex Blasche2019-05-073-13/+7
* | | Remove use of deprecated btle device scan API on AndroidAlex Blasche2019-05-032-15/+42
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-277-9/+98
|\| |
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/stagin...Liang Qi2019-04-256-8/+97
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-206-8/+97
| | |\|
| | | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+42
| | | |\
| | | | * Add changes file for Qt 5.12.3v5.12.3Alex Blasche2019-04-031-0/+42
| | | * | CoreBluetooth: add a missing -peripheral:didModifyServices: methodTimur Pocheptsov2019-04-164-0/+43
| | | * | winrt: Fix reading of descriptor valuesOliver Wolff2019-04-151-8/+12
| * | | | Fix nfc corkboard example on AndroidAlex Blasche2019-04-251-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-1613-512/+778
|\| | |
| * | | winrt: Remove unused functionv5.13.0-beta3Oliver Wolff2019-04-151-28/+0
| * | | winrt: Move byteArrayFromBuffer into qbluetoothutils_winrtOliver Wolff2019-04-156-82/+43
| * | | winrt: Avoid asserts in helper functionsOliver Wolff2019-04-151-8/+24
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-134-44/+78
| |\| |
| | * | Don't create QBluetoothServiceInfo when uuid is nullAlex Blasche2019-04-121-1/+4
| | * | Android: Don't filter SPP uuidAlex Blasche2019-04-121-11/+12
| | * | Streamline QBluetoothServiceDiscoveryAgentPrivate::populateDiscoveredServicesAlex Blasche2019-04-101-32/+33
| | * | Android: Increase chance of establishing serial connection w/o SPP uuidAlex Blasche2019-04-102-3/+32
| | * | Fix clang-cl errors about narrowing conversionsKai Koehne2019-04-081-1/+1
| * | | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-04-122-4/+4
| * | | winrt: Avoid asserts in discoverServiceDetailsOliver Wolff2019-04-101-15/+26
| * | | winrt: Avoid asserts in writeCharacteristicOliver Wolff2019-04-101-9/+18
| * | | winrt: Avoid asserts in readCharacteristicOliver Wolff2019-04-101-8/+8
| * | | winrt: Avoid asserts in writeDescriptorOliver Wolff2019-04-101-24/+59
| * | | winrt: Avoid asserts in readDescriptorOliver Wolff2019-04-101-25/+71
| * | | winrt: Avoid deprecated functions and asserts in discoverServicesOliver Wolff2019-04-101-10/+27
| * | | winrt: Avoid deprecated functions and asserts in obtainIncludedServicesOliver Wolff2019-04-101-9/+20
| * | | winrt: Avoid asserts in getNativeCharacteristicOliver Wolff2019-04-101-2/+23
| * | | winrt: unregister status change callbacks on disconnectOliver Wolff2019-04-102-10/+20
| * | | winrt: Avoid asserts in connectToDeviceOliver Wolff2019-04-101-102/+106
| * | | winrt: Do not assert/crash in registerforValueChanges/unregisterFromValueChangesOliver Wolff2019-04-101-1/+13
| * | | winrt: Proper error handling in obtainCharListOliver Wolff2019-04-102-147/+254
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-096-38/+44
|\| | |
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-066-38/+44
| |\| |
| | * | Use QAndroidJniExceptionCleaner instead of QAndroidJniEnvironmentBogDan Vatra2019-04-051-11/+4
| | * | Fix possible leakBogDan Vatra2019-04-051-2/+1