summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Remove the throwing code in Nfc enableForegroundDispatch for AndroidPeter Rustler2015-03-041-2/+3
* Update Digia headers to QtCompany headersAlex Blasche2015-03-0213-280/+176
* Merge branch 'dev' into neardAlex Blasche2015-02-26331-2787/+2566
|\
| * Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-169-16/+20
| |\
| | * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-169-16/+20
| | |\
| | | * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-128-9/+9
| | | * Bluez5: Fix plain text handover of xml from sdpscannerAlex Blasche2015-02-121-6/+10
| | | * Use single-char QString operations for efficiencySergio Ahumada2015-02-112-6/+6
| * | | Update copyright headersJani Heikkinen2015-02-16329-2533/+2221
| |/ /
| * | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2015-02-1113-156/+174
| |\|
| | * Merge remote-tracking branch 'gerrit/5.4.1' into 5.4Alex Blasche2015-02-105-60/+68
| | |\
| | | * Fix crashing btchat example when selecting remote devicev5.4.1Alex Blasche2015-01-294-59/+65
| | | * Register PublicBrowseGroup as sequenceAlex Blasche2015-01-211-1/+3
| | * | Avoid potential memory leak on variable 'device'Sergio Ahumada2015-02-101-3/+11
| | * | Android: Fix leaking of local reference table in QBluetoothSocketAlex Blasche2015-02-051-33/+32
| | * | Android: Enable pairing for Android v15+Alex Blasche2015-02-022-5/+5
| | * | Fix build with -no-c++11Fatih Aşıcı2015-01-274-55/+58
| | |/
| * | Bluetooth - add runtime OS version check (OS X)Timur Pocheptsov2015-02-061-24/+52
| * | Bluetooth - check OS X/iOS version in runtimeTimur Pocheptsov2015-02-061-4/+8
| * | Bluetooth - check OS X version in runtimeTimur Pocheptsov2015-02-061-2/+6
| * | Bluetooth - runtime OS X/iOS version checkTimur Pocheptsov2015-02-061-15/+14
| * | Qt Bluetooth - add runtime OS version check (OS X, iOS)Timur Pocheptsov2015-02-062-25/+41
| * | Qt Bluetooth - update documentationTimur Pocheptsov2015-02-062-0/+9
| * | Bump QtBluetooth QML versions to 5.5Alex Blasche2015-02-052-5/+5
| * | Bump QtNfc QML API version to 5.5Alex Blasche2015-02-052-3/+12
| * | Mark new NearField signals and property with Revision tagAlex Blasche2015-02-051-4/+4
* | | Merge branch 'dev' into neardAlex Blasche2015-02-0270-1246/+1374
|\| |
| * | Optimize qRegisterMetaType() calls for QBluetoothTransferReplyAlex Blasche2015-01-282-2/+2
| * | Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()Alex Blasche2015-01-2816-23/+35
| * | Disable writing of Ndef messages due to crash in Neard daemonAlex Blasche2015-01-131-0/+5
| * | Neard: fix tag writingMartin Leutelt2015-01-131-38/+59
| * | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-12-306-18/+57
| |\ \
| | * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-176-18/+57
| | |\|
| | | * Improve documentation for undiscovered QLEServiceAlex Blasche2014-12-011-1/+14
| | | * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-275-17/+43
| | | |\
| | | | * Fix crash during service discovery on Androidv5.4.0Alex Blasche2014-11-211-13/+11
| | | | * Add missing InvalidBluetoothAdapterError to QML discovery modelAlex Blasche2014-11-214-4/+32
| * | | | QBluetoothTransferReply - cleanup (OS X)Timur Pocheptsov2014-12-183-76/+58
| * | | | Bluetooth socket listener (OS X)Timur Pocheptsov2014-12-181-14/+6
| * | | | QBluetoothServer - cleanup (OS X)Timur Pocheptsov2014-12-181-41/+30
| * | | | QBluetoothSocket - cleanup (OS X)Timur Pocheptsov2014-12-185-97/+73
| * | | | QBluetoothServiceInfo - cleanup (OS X)Timur Pocheptsov2014-12-182-50/+28
| * | | | QBluetoothServiceDiscoveryAgent - cleanup (OS X)Timur Pocheptsov2014-12-184-56/+34
| * | | | QBluetoothDeviceDiscoveryAgent - cleanup (OS X/iOS)Timur Pocheptsov2014-12-187-308/+80
| * | | | QBluetoothLocalDevice - cleanup (OS X)Timur Pocheptsov2014-12-183-81/+53
| |/ / /
| * | | Improve some parts of the SmartPoster API docsAlex Blasche2014-12-112-5/+26
| * | | Neard: Read all availabe SmartPoster dataAlex Blasche2014-12-111-7/+20
| * | | Fix writing of NFC URI recordsAlex Blasche2014-12-111-2/+2
| * | | QML NearField type never emitted tagRemoved() signalAlex Blasche2014-12-101-0/+2
| * | | Enable automatic tag polling if message handler is not supported.Alex Blasche2014-12-101-1/+1