summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* tvOS supportMike Krus2016-01-052-4/+3
* Merge "Merge remote-tracking branch 'gerrit/5.6' into dev" into refs/staging/devAlex Blasche2015-12-2116-385/+641
|\
| * Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-12-2116-385/+641
| |\
| | * Properly initialize the m_manager pointer.Frank Meerkoetter2015-12-181-0/+1
| | * Fix missing breakFrank Meerkoetter2015-12-181-0/+1
| | * Fix resource leak.Frank Meerkoetter2015-12-182-0/+6
| | * Add "we mean it header statement" to osx private headerAlex Blasche2015-12-151-0/+11
| | * Bluetooth: Documentation fix.v5.6.0-beta1Christian Kandeler2015-12-141-4/+4
| | * qlowenergycontroller_osx - move delegate to the qt_LE_queueTimur Pocheptsov2015-12-107-376/+613
| | * Fix assignment of wrong errors values in read operationsDenis Shienkov2015-12-081-2/+2
| | * Fix trivial typosKonstantin Ritt2015-12-042-3/+3
* | | QBluetoothServiceDiscoveryAgentPrivate: use const reference forAnton Kudryavtsev2015-12-072-4/+4
|/ /
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-0123-437/+533
|\|
| * Merge remote-tracking branch 'gerrit/5.5' into 5.6Alex Blasche2015-12-0114-37/+64
| |\
| | * Don't register meta types during static init time5.5Alex Blasche2015-11-3015-36/+63
| | * Enforce unbuffered L2CAP socket for GATTAlex Blasche2015-11-271-1/+3
| * | BT/BlueZ: Do not react to "Insufficient Authorization" error.Christian Kandeler2015-11-301-1/+1
| * | Bluetooth LE scan - move to its own dispatch queue (iOS/OS X)Timur Pocheptsov2015-11-277-393/+452
| * | Android: Build .jar filesEskil Abrahamsen Blomfeldt2015-11-231-1/+4
| * | LE discovery - change a timer creation time (iOS/OS X)Timur Pocheptsov2015-11-201-10/+11
| * | Improve QBluetoothDeviceInfo::address() documentationAlex Blasche2015-11-161-0/+6
| * | Standardize DST terminology.Edward Welbourne2015-11-121-1/+1
* | | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-11-1113-79/+125
|\| |
| * | QLowEnergyController: Add missing error string for ConnectionError.Christian Kandeler2015-11-101-1/+5
| * | Add comment that QBluetoothSocket only supports asynch read/writeAlex Blasche2015-11-021-0/+3
| * | Doc: minor link issuesNico Vertriest2015-10-302-2/+2
| * | CoreBluetooth - simplify osxbledeviceinquiry's code.Timur Pocheptsov2015-10-292-42/+43
| * | Core Bluetooth - give a user the second chance to enable BluetoothTimur Pocheptsov2015-10-291-11/+52
| * | Bluetooth: Put some data types into the Qt namespace.Christian Kandeler2015-10-231-0/+4
| * | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-212-2/+2
| * | Bluetooth: Fix value of an ATT error type.Christian Kandeler2015-10-161-4/+10
| * | Bluetooth socket: Simplify address conversion.Christian Kandeler2015-10-153-30/+17
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1437-11/+391
|\| |
| * | Merge remote-tracking branch 'gerrit/5.5' into 5.6Alex Blasche2015-10-131-0/+2
| |\|
| | * CoreBluetooth - update for iOS 9.0Timur Pocheptsov2015-10-122-10/+31
| | * Bluetooth device discovery agent (bluez): Prevent null pointer access.Christian Kandeler2015-10-081-0/+2
| * | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0932-0/+352
| * | CoreBluetooth - update for iOS 9.0Timur Pocheptsov2015-10-082-10/+31
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-022-1/+6
| |\|
| | * Tweak documentation terminologyAlex Blasche2015-09-041-1/+1
| | * Improve QBluetoothDeviceInfo::deviceUuid() documentationAlex Blasche2015-09-031-0/+5
* | | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-09-2223-154/+288
|\| |
| * | Use the new way of disabling strict C++ supportThiago Macieira2015-09-211-9/+1
| * | [Bluetooth] Optimize loopsKonstantin Ritt2015-09-1615-100/+196
| * | A nano optimization to QLowEnergyServiceKonstantin Ritt2015-09-162-17/+8
| * | bluez: SDP: find a device before creating it.Robin Burchell2015-09-153-13/+54
| * | QBluetoothSocket's securityFlag exists since Qt 5.6 and not 5.5Alex Blasche2015-09-151-2/+2
| * | Introduce QML Nfc 5.6 versionv5.6.0-alpha1Alex Blasche2015-08-252-3/+9
| * | Introduce QML Bluetooth 5.6 version.Alex Blasche2015-08-252-5/+5
| * | Stop device discovery session before retrieving service records.Robin Burchell2015-08-211-0/+2