summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * | bluez: Fix some memory leaks on device discovery.Robin Burchell2015-08-201-2/+7
| * | bluez: peername: find a device before creating it.Robin Burchell2015-08-201-3/+3
| * | To check for errors when starting discovery, wait for the call.Hannu Mallat2015-08-201-0/+1
| * | Merge remote-tracking branch 'gerrit/5.5' into 5.6Alex Blasche2015-08-193-7/+34
| |\|
* | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-251-2/+2
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-093-7/+34
|\ \ \ | |/ / |/| / | |/
| * Parse all char descriptions in one goAlex Blasche2015-07-131-0/+1
| * Add debug option to sdpscanner permitting plain text output of scan resultsAlex Blasche2015-07-131-4/+30
| * Do not cut 32bit value down to 16bitAlex Blasche2015-07-132-2/+2
| * Cut high bits from QLECharacteristic::PropertyTypesAlex Blasche2015-07-131-1/+1
* | Add missing metatype registration related functions for Q_ENUMsOliver Wolff2015-07-105-0/+17
* | Android: Apply QBluetoothSocket::preferredSecurityFlags during connectAlex Blasche2015-07-071-2/+21
* | Bluez: Apply QBluetoothSocket::preferredSecurityFlags during connectAlex Blasche2015-07-071-0/+21
* | Bluez: Improve security flag handling in QBluetoothServerAlex Blasche2015-07-072-82/+73
* | Add preferredSecurityFlags to QBluetoothSocketAlex Blasche2015-07-037-6/+80
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2922-38/+307
|\|
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-261-0/+1
| |\
| | * Android: Fix crashing QBluetoothDeviceDiscoveryAgent on Androids <v18v5.5.0-rc1v5.5.0Alex Blasche2015-06-101-0/+1
| * | Port from Q_ENUMS to new macro Q_ENUMKonstantin Ritt2015-06-2319-36/+37
| * | Remove main documentation stating Blackberry being supportedAlex Blasche2015-06-172-2/+2
| * | Update qmltypes for QtNfcAlex Blasche2015-06-101-1/+2
| * | Update qmltypes for QtBluetoothAlex Blasche2015-06-101-1/+267
| |/
* | Remove BlackBerry as supported platform from QtNfcAlex Blasche2015-06-1825-2911/+2
* | Document that Security flags are not supported on OS XAlex Blasche2015-06-171-0/+2
* | Remove QNX/BlackBerry implementation for QtBluetoothAlex Blasche2015-06-1726-3163/+24
* | Fix qdoc warning due to wrong parameter name used in docsAlex Blasche2015-06-161-1/+1
* | Update list of supported platforms in QtNfcAlex Blasche2015-06-101-1/+3
* | Merge QtNfc on Android into dev/Qt 5.6Alex Blasche2015-06-0927-32/+2362
|\ \ | |/ |/|
| * Merge remote-tracking branch 'gerrit/5.5' into neardAlex Blasche2015-05-1126-268/+1090
| |\
| * | Added documentation for NFC on AndroidPeter Rustler2015-04-133-14/+125
| * | Fix implementation of and improve NdefFilter usageStephan Binner2015-04-025-24/+111
| * | Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2015-04-0128-226/+789
| |\ \
| * | | Android Nfc: Use of StringLiteral instead of static const QStringPeter Rustler2015-03-192-47/+46
| * | | Use AndroidExtras for all functions in qnearfieldtarget_androidPeter Rustler2015-03-192-96/+57
| * | | Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-199-203/+78
| * | | Add the feature to get the nfc intent that startet the appPeter Rustler2015-03-185-1/+41
| * | | Bugfix: Exit updateReceiveState if we are paused and not receiving.Peter Rustler2015-03-181-3/+10
| * | | Bugfix: Call stopDiscoveryId in stopDiscovery.Peter Rustler2015-03-181-1/+1