summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2197-1518/+11562
|\
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3Liang Qi2017-04-182-6/+4
| |\
| | * LE/Android: fix status code descriptions5.8Konstantin Ritt2017-04-101-2/+2
| | * QBluetoothSocket/bluez: fix QString::arg() usageMarc Mutz2017-03-241-4/+2
| * | Fix failing heart-rate example on macOSv5.9.0-beta2Milla Pohjanheimo2017-04-131-1/+1
| * | Remove heartlistener exampleAlex Blasche2017-04-0728-1898/+2
| * | Use heartrate-game example for snippets in BTLE overviewAlex Blasche2017-04-073-14/+34
| * | Add Logging category provisioning to heartrate-server exampleAlex Blasche2017-04-071-0/+2
| * | Fix undocumented parameter warning from qdocAlex Blasche2017-04-061-3/+4
| * | Ensure that QLowEnergyController::connected() is emitted on BlueZAlex Blasche2017-04-061-0/+3
| * | Update heartrate-game against latest heartlistener exampleAlex Blasche2017-04-062-3/+5
| * | Replace custom QT_BLUEZ_BLUETOOTH against the related feature defineAlex Blasche2017-04-0620-41/+35
| * | Remove not needed includes from heartrate-gameAlex Blasche2017-04-052-3/+0
| * | The BlueZ feature implies that QtDBus is enabledAlex Blasche2017-04-055-5/+5
| * | Permit BlueZ platforms to set the address type in heartrate-gameAlex Blasche2017-04-059-4/+86
| * | Update .gitignore file reflecting recent changesAlex Blasche2017-04-041-0/+9
| * | Add documentation for the HeartRate game exampleAlex Blasche2017-04-046-0/+87
| * | Add means to enable simulator build with one easy defineAlex Blasche2017-04-048-15/+71
| * | Add new heartrate exampleAlex Blasche2017-04-0333-0/+2602
| * | Correct the use of QString::argThiago Macieira2017-04-031-4/+4
| * | Remove unused function convertAddressThiago Macieira2017-04-031-10/+0
| * | Fix detecting simple NFC tagsOleg Evseev2017-03-311-6/+9
| * | NFC on Android: Fix crash on restart of an app in debug buildv5.9.0-beta1Lars Schmertmann2017-03-162-1/+4
| * | Ensure the passkey and pincode for pairing are randomAlex Blasche2017-03-141-2/+2
| * | Fix unused parameter warningAlex Blasche2017-03-131-0/+1
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-104-23/+9109
| |\|
| | * Match connected device changes based on local device instanceAlex Blasche2017-02-172-23/+39
| | * Binary compatibility files for qtconnectivity (5.8.0)Milla Pohjanheimo2017-02-032-0/+9070
| * | NFC on Android: Fix crash on restart of an appLars Schmertmann2017-03-081-0/+4
| * | Update QML export versions in QtConnectivity APIsAlex Blasche2017-02-284-9/+9
* | | Register additional meta typesLars Schmertmann2017-03-307-14/+6
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-02-2812-55/+210
|\| |
| * | WinRT: Remove dummy warningv5.9.0-alpha1Oliver Wolff2017-02-083-6/+3
| * | Rename WinRT logging categoryOliver Wolff2017-02-082-2/+2
| * | Remove WinPhone leftoversOliver Wolff2017-02-082-15/+2
| * | winrt: Accept malformed profile descriptor list from applicationsOliver Wolff2017-02-081-0/+72
| * | Provide support for QLEService::writeDescriptor() on Android PeripheralAlex Blasche2017-02-062-5/+60
| * | Add a small section describing how to enable Bluetooth loggingAlex Blasche2017-02-061-0/+8
| * | Add missing logging categories to QtBluetooth docsAlex Blasche2017-02-061-3/+9
| * | Update platform feature table for QtBluetoothAlex Blasche2017-02-061-2/+2
| * | QLowEnergyController: Fix spelling errorFriedemann Kleint2017-02-061-1/+1
| * | winrt: Set proper socket state in setSocketDescriptorOliver Wolff2017-02-031-0/+1
| * | winrt: Use custom setSocketDescriptor functionOliver Wolff2017-02-033-8/+19
| * | winrt: Register callbacks in Xaml threadOliver Wolff2017-02-032-14/+26
| * | winrt: maxPendingConnections must be lower than currently pending connectionsOliver Wolff2017-02-031-0/+6
* | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ /
* | Document that BT servers on Android and WinRT only support RFCOMMOliver Wolff2017-01-311-0/+1
* | winrt: Add bluetooth server supportOliver Wolff2017-01-317-8/+682
* | winrt: Fix wrong function name in invokeMethod in bluetooth socketOliver Wolff2017-01-301-1/+1
* | Remove wrong attribute assignment from btchat exampleOliver Wolff2017-01-301-1/+0