summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Misc fixes for the new corkboard exampleAlex Blasche2014-02-039-13/+61
* Add the nfc corkboard exampleFabian Bumberger2014-02-0311-0/+353
* Adjust qml scanner example to high dpi displayAlex Blasche2014-01-292-9/+19
* Add documentation for picture transfer example and minor QML fixesAlex Blasche2014-01-2819-23/+140
* Adding a qml OPP example for sending picturesFabian Bumberger2014-01-2812-0/+676
* Fix MSVC-warnings about truncation of constant value in tst_qnearfieldtagtype...Friedemann Kleint2014-01-241-4/+4
* Suppress warning from QObject attempting to connect null objectAlex Blasche2014-01-241-3/+5
* Remove const modifier from QBluetoothLocalDevice signals.Alex Blasche2014-01-242-5/+5
* Don't stop Bt discoveries while we have InvalidBluetoothAdapterErrorAlex Blasche2014-01-202-1/+4
* whitespace fixesOswald Buddenhagen2014-01-2015-24/+24
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-174-19/+69
|\
| * Cleanup more duplicated code in SDP discovery class.Alex Blasche2014-01-171-16/+5
| * Reduce SDP discovery debug output on BluezAlex Blasche2014-01-171-2/+0
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| * Don't build scanner example without QtQuickAlex Blasche2014-01-151-1/+1
| * Add change log for 5.2.1Alex Blasche2014-01-131-0/+63
* | Emit PoweredOffError if required during device discovery start on BluezAlex Blasche2014-01-161-0/+12
* | Reset QML Bluetooth discovery model if an error occurred during device discoveryAlex Blasche2014-01-151-0/+5
* | Document a somewhat peculiar signal behavior mismatch during Bt discoveryAlex Blasche2014-01-152-3/+9
* | Print error message in Bluetooth QML scanner example.Alex Blasche2014-01-151-0/+12
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-108-25/+34
|\|
| * Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-084-19/+30
| * Fix remaining compiler warnings in QtConnectivity moduleFabian Bumberger2014-01-073-4/+3
| * Don't set the internal service discovery state twice to the sameAlex Blasche2014-01-071-2/+0
* | BlackBerry: Fix compilationSergio Ahumada2014-01-082-8/+8
* | Fix remaining uncategorized debug/warning messages (catchup in dev)Alex Blasche2014-01-083-8/+8
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-0625-230/+199
|\|
| * Translate so far untranslated error strings.Alex Blasche2013-12-203-7/+7
| * Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-2023-225/+190
| * Improve error reporting.Alex Blasche2013-12-202-1/+6
* | Improve and fix documentation for the Bluetooth discovery classes.Alex Blasche2013-12-202-12/+25
* | Check the local adapter's BluetoothAdress before doing the discoveryFabian Bumberger2013-12-206-3/+75
* | Fix error state of default QBluetoothServiceDiscoveryAgentAlex Blasche2013-12-201-1/+1
* | Fix active state of default implementation of QBluetoothServiceDiscoveryAgentFabian Bumberger2013-12-201-0/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-4/+4
|\|
| * QNX: Fix a dangling pointer use in QBluetoothServiceDiscoveryAgent on QNXRobin Burchell2013-12-051-4/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-299-3/+28
|\|
| * Fix make install rules to all examples in QtConnectivity repoAlex Blasche2013-11-289-3/+28
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
* | Ensure that qtandroidextras is checked out when building qtconnectivityAlex Blasche2013-11-281-0/+1
* | Implemented QNX API for device "connected" statusNedim Hadzic2013-11-272-2/+62
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+3
|\|
| * Unwarn on clangv5.2.0-rc1v5.2.0Alex Blasche2013-11-111-5/+3
* | Added new API for device "connected" statusOleksandr Matasov2013-11-126-1/+167
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-084-5/+5
|\|
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| * Build Bluetooth and NFC only for BlackberryAndreas Holzammer2013-11-012-2/+2
| * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
* | Update NFC QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+7
* | Register NFC QML APIs as 5.3Alex Blasche2013-10-231-0/+5