summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-023-8/+23
|\
| * Windows: Cancel and close the operation before deleting the SocketWorkerAndy Shaw2018-01-261-0/+4
| * Initialize the discoveryAgent variable to 0Andy Shaw2018-01-242-0/+2
| * winrt: Finish classic BT device discovery if no device is foundOliver Wolff2018-01-191-8/+17
* | Revamp Qt NFC examples: poster exampleAndrew O'Doherty2018-02-012-40/+21
* | Revamp Qt NFC examples: ndefeditor exampleAndrew O'Doherty2018-02-017-42/+29
* | Revamp Qt NFC examples: corkboard exampleAndrew O'Doherty2018-02-012-6/+6
* | Revamp Qt NFC examples: annotatedurl exampleAndrew O'Doherty2018-02-015-38/+33
* | Windows: Do not assert due to insufficient accessAndy Shaw2018-01-251-23/+28
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-187-12/+65
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Qt Forward Merge Bot2018-01-171-0/+31
| |\
| | * Add changes file for Qt 5.9.4v5.9.4Alex Blasche2018-01-111-0/+31
| * | Disable compiler flag using proper qmake comment styleAlex Blasche2018-01-161-1/+1
| * | BlueZ: Fix inconsistent QLEService error stateAlex Blasche2018-01-081-2/+2
| * | QtBluetooth: Fix heartrate-game for QT_PLATFORM_UIKITTimur Pocheptsov2018-01-041-1/+2
| |/
| * winrt: Do not crash when trying to an unreachable paired LE deviceOliver Wolff2017-12-121-1/+11
| * winrt: Add bluetooth capabilities for msvc2017 as wellOliver Wolff2017-12-121-1/+1
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| * Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.9" into refs/stagin...Liang Qi2017-11-231-0/+37
| |\
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+37
| | |\
| * | | BlueZ: Prevent hanging of QLEController job queue due to comm timeoutAlex Blasche2017-11-231-3/+7
| |/ /
| * | Example heartrate-server needs only core and bluetooth modulePeter Seiderer2017-11-201-1/+1
| * | winrt: Early return instead of assert is case of errorMaurice Kalinowski2017-11-161-2/+9
* | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-124-0/+4
* | | Improve documentation about missing iOS support in QtBluetoothAlex Blasche2018-01-045-0/+14
* | | Expect failure for cmac tests on qemu testsSami Nurmenniemi2018-01-032-0/+52
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
* | | Update QML versions for QtBluetooth and QtNfc in step with Qt versionAlex Blasche2017-12-154-15/+11
* | | Add binary compatibility files for QtConnectivity for 5.10Milla Pohjanheimo2017-12-132-0/+9742
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+115
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+37
| |\ \ \ | | | |/ | | |/|
| | * | Add changes file for Qt 5.9.3v5.9.3Alex Blasche2017-11-081-0/+37
| | |/
| * | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-202-1/+30
| |\ \ | |/ / |/| |
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-152-1/+30
|\ \ \ | | |/ | |/|
| * | winrt: Do not assert when registering a service without a local BT adapterOliver Wolff2017-11-031-1/+6
| * | winrt: Reflect unsupported state of peripheral role of lowenergycontrollerOliver Wolff2017-11-031-0/+24
| | * Add changes file for Qt 5.10.0Alex Blasche2017-11-201-0/+78
| |/ |/|
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-033-7/+7
* | CoreBluetooth - fix compilation errorsTimur Pocheptsov2017-11-023-0/+15
* | Remove qlowenergycontroller_p.cpp from macOS buildAlex Blasche2017-10-301-1/+0
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-30121-302/+1459
|\ \ | |/
| * winrt: Fix build using -no-pchOliver Wolff2017-10-255-0/+14
| * Fix writing of NdefMessages on androidDaniel Engelke2017-10-241-2/+1
| * Fix outdated BSD license headerKai Koehne2017-10-17113-297/+1427
| * Fix crash due to inconsistent state in QLEController during JobDisconnectDeviceAlex Blasche2017-10-172-3/+17
* | Merge remote-tracking branch 'gerrit/5.9' into 5.10v5.10.0-beta3Alex Blasche2017-10-1740-144/+302
|\ \ | |/
| * Fix outdated FDL license headerKai Koehne2017-10-1626-125/+125
| * IOBluetooth: warn about incorrent thread/runloopTimur Pocheptsov2017-10-117-2/+32
| * Replace mixing of const_iterator by for-eachAndré Klitzing2017-10-091-4/+2
| * Bump versionOswald Buddenhagen2017-10-061-1/+1