summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-1917-66/+429
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-1610-42/+383
| |\
| | * QBluetoothSocket::connectToService - check a socket type firstTimur Pocheptsov2016-08-262-4/+51
| | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-167-22/+22
| | * Android: Avoid newDevice signal spamming in QBluetoothDeviceDiscoveryAgentAlex Blasche2016-08-011-5/+12
| | * Android: Device discovery doesn't provide major & minor device class infoAlex Blasche2016-08-011-11/+298
| * | Prepare QtNfc for Android Service supportAlex Blasche2016-08-312-3/+11
| * | Make QtBluetooth Low Energy work when Qt runs as Android serviceAlex Blasche2016-08-032-7/+7
| * | Make Classic QtBluetooth work as an Android serviceAlex Blasche2016-08-033-14/+28
* | | Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-262-2/+2
* | | winrt: Remove comment that no longer appliesOliver Wolff2016-08-091-4/+0
* | | winrt: Filter devices found by the LE device watcherOliver Wolff2016-08-092-3/+14
* | | winrt: Connect LE timeout to correct discovery workerOliver Wolff2016-08-091-2/+6
* | | winrt: Add mean to choose bluetooth discovery modeOliver Wolff2016-08-091-20/+26
* | | winrt: Stop LE scan timer when stopping device discoveryOliver Wolff2016-08-091-0/+2
* | | winrt: Start device watcherOliver Wolff2016-08-091-0/+2
* | | winrt: Add missing error handling for device discoveryOliver Wolff2016-08-091-3/+8
* | | winrt: Implement LE device discovery timeoutOliver Wolff2016-08-042-4/+86
* | | Do not permit QLEController::connectToDevice() in peripheral modeAlex Blasche2016-08-031-0/+5
* | | Merge remote-tracking branch 'gerrit/btle' into devAlex Blasche2016-08-038-1/+1435
|\ \ \
| * | | Proper state and warning on access denied errorOliver Wolff2016-07-281-0/+5
| * | | Register connectionStatus callback in Xaml threadOliver Wolff2016-07-261-12/+16
| * | | WinRT: getNativeService/getNativeCharacteristic helper functionsOliver Wolff2016-07-262-53/+70
| * | | winrt: Proper handling of ClientCharacteristicConfigurationOliver Wolff2016-07-261-91/+229
| * | | WinRT: use constrefs for ComPtr parameters where applicableOliver Wolff2016-07-191-4/+4
| * | | Merge remote-tracking branch 'gerrit/dev' into btleAlex Blasche2016-07-1324-422/+581
| |\ \ \
| * | | | WinRT: BTLE: Write descriptorsOliver Wolff2016-06-161-5/+89
| * | | | WinRT: BTLE: Write characteristicsOliver Wolff2016-06-161-6/+83
| * | | | WinRT: BTLE: Read descriptorsOliver Wolff2016-06-161-4/+70
| * | | | WinRT: BTLE: Read characteristicsOliver Wolff2016-06-161-3/+57
| * | | | Merge remote-tracking branch 'gerrit/dev' into btleAlex Blasche2016-06-1029-587/+623
| |\ \ \ \
| * | | | | WinRT: Use ComPtr for native typesOliver Wolff2016-05-311-1/+1
| * | | | | WinRT: BTLE: Discover service detailsOliver Wolff2016-05-311-2/+237
| * | | | | WinRT: BTLE: Discover list of available servicesOliver Wolff2016-05-312-1/+86
| * | | | | Merge remote-tracking branch 'gerrit/dev' into btleAlex Blasche2016-05-2716-14/+98
| |\ \ \ \ \
| * | | | | | winrt: BTLE: Device (dis-)connectionOliver Wolff2016-05-263-1/+276
| * | | | | | Assume presence of local bluetooth adapter on WinPhoneOliver Wolff2016-05-261-0/+3
| * | | | | | Detection of bluetooth (LE) devices has to happen in Xaml threadOliver Wolff2016-05-262-2/+7
| * | | | | | Fix missing printDummyWarning() symbol on WinRTAlex Blasche2016-05-171-0/+3
| * | | | | | Merge branch 'dev' into btleAlex Blasche2016-05-13291-5768/+13936
| |\ \ \ \ \ \
| * | | | | | | winphone: Added bluetooth device discoveryOliver Wolff2015-09-224-1/+376
| * | | | | | | Merge remote-tracking branch 'gerrit/dev' into btleAlex Blasche2015-09-0413-93/+168
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into btleAlex Blasche2015-07-06113-5423/+2125
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gerrit/dev' into btleAlex Blasche2015-06-01346-3589/+11751
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bluetooth - device discovery agent (cleanup)Timur Pocheptsov2014-11-072-50/+23
* | | | | | | | | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-028-15/+66
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-2/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Document the meaning of QBluetoothDeviceInfo::minorDeviceClass()Alex Blasche2016-07-252-2/+7
| | * | | | | | | | | Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-202-0/+10
| | * | | | | | | | | Android: Workaround clang default destructor export bugBogDan Vatra2016-07-192-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:31:19 +0000