summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gerrit/5.6.1' into 5.7.0v5.7.0-rc1Alex Blasche2016-05-237-0/+28
|\
| * QtBluetooth (iOS) - fix potential linker errorsv5.6.1-1v5.6.1Timur Pocheptsov2016-05-237-0/+28
* | Merge 5.7 into 5.7.0Oswald Buddenhagen2016-05-209-17/+134
|\ \
| * \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-195-3/+65
| |\ \
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-194-2/+64
| | |\|
| | | * Add changelog for 5.6.1 releaseAlex Blasche2016-05-191-0/+60
| | | * Fix iOS compilationAlex Blasche2016-05-191-0/+2
| | | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-122-2/+2
| | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | * | Increase the BTLE scan timeout to 25sAlex Blasche2016-05-181-1/+1
| | |/
| * | Fix endianness conversion order bug when handling 128bit Qt UuidAlex Blasche2016-05-184-14/+67
| * | Zero out the advertising parameters data before setting the fields.Christian Kandeler2016-05-181-0/+2
* | | Add missing documentation to BTLE overview documentationAlex Blasche2016-05-201-12/+43
* | | Add changelog for Qt 5.7.0 releaseAlex Blasche2016-05-201-0/+39
* | | Improve QtBluetooth index pageAlex Blasche2016-05-201-2/+5
* | | Add missing \since 5.7 markers to QLE classesAlex Blasche2016-05-192-1/+23
* | | Mark QBluetooth::AttAccessConstraint as 5.7 API in class docsAlex Blasche2016-05-191-0/+1
* | | Don't print the same advertising code snippet twiceAlex Blasche2016-05-191-1/+0
|/ /
* | QLowEnergyController: fix new uses of 0 as null pointer constantMarc Mutz2016-05-121-4/+4
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-0629-71/+224
|\|
| * Add a runtime warning when dummy QtBluetooth backend is runningAlex Blasche2016-05-0412-1/+134
| * Bluez5: Fix serial service discovery inside QBluetoothSocketAlex Blasche2016-04-291-5/+7
| * Fix QBluetoothServiceInfo QDebug operatorAlex Blasche2016-04-291-23/+31
| * fix example installsOswald Buddenhagen2016-04-283-6/+13
| * purge unreferenced .ui fileOswald Buddenhagen2016-04-281-21/+0
| * Increase test coverage in bttestuiAlex Blasche2016-04-281-1/+1
| * Improve QBluetoothServiceDiscoveryAgent::setUuidFilter() docsAlex Blasche2016-04-271-1/+6
| * Peripheral Privacy Flag (0x2A02) may not be writable on some platformsAlex Blasche2016-04-271-2/+1
| * Improve QBluetoothUuid(QString) ctor documentationAlex Blasche2016-04-261-3/+6
| * Fix typo in Android permission nameAlex Blasche2016-04-131-1/+1
| * Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-132-5/+6
| * Fix Annotated URL Example on AndroidAlex Blasche2016-04-133-2/+11
| * Android: Ensure Bluetooth device discovery finds remote devicesAlex Blasche2016-04-132-1/+4
| * Document changed behavior of QBLD::address() on Android 6.0Alex Blasche2016-04-131-0/+4
* | Do not pin the QML plugins import version.Alex Blasche2016-05-044-8/+2
* | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-295-5/+5
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0817-3/+3
|\|
| * OSXBTCentralManager - fix details discovery (iOS/OS X)Timur Pocheptsov2016-04-041-1/+1
| * Spelling fixFrank Meerkoetter2016-03-231-2/+2
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2212-0/+0
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-223-0/+0
* | Remove simulator support for NFCRainer Keller2016-04-057-776/+0
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-2117-31/+33
|\|
| * Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| * Add explicit and make public headers compile with -Wzero-as-null-pointer-cons...Marc Mutz2016-03-1516-27/+26
* | Android: Use default API version (16)BogDan Vatra2016-03-171-1/+0
* | Fix QLEServiceData comparison operator inconsistencyAlex Blasche2016-03-093-4/+18
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-11/+11
|\|
| * don't over-expose private dependenciesOswald Buddenhagen2016-02-252-7/+7
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-252-4/+3