summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Shift all OSX & iOS translations into C++ filev5.5.0-alpha1Alex Blasche2015-03-0610-52/+235
* Further fixes to translated messages.Friedemann Kleint2015-03-053-4/+5
* Further fixes to Bluetooth UUID messages.Friedemann Kleint2015-03-021-11/+32
* Fix spelling in messages.Friedemann Kleint2015-03-022-4/+4
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2411-11/+23348
|\
| * Improve QBluetoothServiceInfo documentationAlex Blasche2015-02-171-2/+5
| * Set QBluetoothServer::ServiceAlreadyRegisteredError where possibleAlex Blasche2015-02-171-2/+4
| * Use proper endian conversion functionsAndreas Schwab2015-02-171-7/+8
| * bic: Add 5.{2,3,4}.0 bic data for QtBluetooth and QtNfcSergio Ahumada2015-02-178-0/+23331
* | 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-16468-3171/+2859
|/ /
* | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2015-02-1117-157/+219
|\|
| * Merge remote-tracking branch 'gerrit/5.4.1' into 5.4Alex Blasche2015-02-109-61/+113
| |\
| | * Fix crashing btchat example when selecting remote devicev5.4.1Alex Blasche2015-01-296-59/+69
| | * Add changelog for QtBluetooth/QtNfc 5.4.1 release.Alex Blasche2015-01-291-0/+38
| | * Register PublicBrowseGroup as sequenceAlex Blasche2015-01-212-2/+6
| * | 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
* | | Optimize qRegisterMetaType() calls for QBluetoothTransferReplyAlex Blasche2015-01-283-3/+2
* | | Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()Alex Blasche2015-01-2828-54/+62
* | | Bluetooth LE - hearlistener example (OS X, iOS)Timur Pocheptsov2015-01-233-1/+20
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-193-1/+16
|\| |
| * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/
| * Make chat example more error tolerantAlex Blasche2014-12-223-1/+16
* | Don't leave UI hanging if NdefMessage handling returned invalid requestAlex Blasche2015-01-131-0/+4
* | 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-307-18/+59
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-177-18/+59
| |\|
| | * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | * Improve documentation for undiscovered QLEServiceAlex Blasche2014-12-011-1/+14
| | * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-276-17/+45
| | |\
| | | * Fix crash during service discovery on Androidv5.4.0Alex Blasche2014-11-211-13/+11
| | | * Add missing InvalidBluetoothAdapterError to QML discovery modelAlex Blasche2014-11-215-4/+34
* | | | QBluetoothTransferReply - cleanup (OS X)Timur Pocheptsov2014-12-183-76/+58