summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into btleAlex Blasche2014-02-17109-513/+6655
|\
| * Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/stagi...Alex Blasche2014-02-154-5/+3
| |\
| | * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-144-5/+3
| | |\
| | | * Fix missing QBluetoothSocket::state update after unsuccessful SDP searchold/5.2Alex Blasche2014-02-131-0/+1
| | | * Fix interaction with Android devicesAlex Blasche2014-02-131-1/+3
| | | * Reduce debug output on BluezAlex Blasche2014-02-111-2/+0
| | | * Explicitly declare the parameter type of QBluetoothServer::error().Alex Blasche2014-02-111-1/+1
| * | | Fix namespaced buildsAlex Blasche2014-02-141-1/+1
| * | | QNX: Config test for libbb2Fabian Bumberger2014-02-141-11/+32
| |/ /
| * | Fix qmake and compiler warningsAlex Blasche2014-02-142-3/+2
| * | Adjust strings for translationAlex Blasche2014-02-138-24/+24
| * | Port QtBluetooth to AndroidAlex Blasche2014-02-1347-64/+4017
| * | Add support for NFC file and data sharingStuart Burge2014-02-1317-8/+1778
| * | Merge branch 'stable' into devAlex Blasche2014-02-075-27/+64
| |\|
| | * QBluetoothServer fixesAlex Blasche2014-02-073-8/+39
| | * Fix broken QBluetoothServiceInfo::serviceClassUuids() callAlex Blasche2014-02-072-19/+25
| * | Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/stagi...Alex Blasche2014-02-0610-88/+138
| |\ \
| | * | Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-0310-88/+138
| | |\|
| | | * Use qt_error_string rather than strerror.Alex Blasche2014-01-303-9/+9
| | | * Synchronize setting of QBluetoothSocket's error string, code and signalAlex Blasche2014-01-303-21/+22
| | | * Don't cache the QBluetoothSocket::localName() & peerName()Alex Blasche2014-01-293-15/+3
| | | * Refine documentation for QBluetoothSocket::localXYZ() functions.Alex Blasche2014-01-281-1/+12
| | | * Initialize QBluetoothSocket::socketError properly.Alex Blasche2014-01-282-0/+2
| | | * Fix crash in Bluez implementation for QBluetoothSocketAlex Blasche2014-01-281-2/+3
| | | * Fix broken SDP discovery on QBluetoothSocketAlex Blasche2014-01-282-2/+4
| | | * Fix crash during SDP discovery on BluezAlex Blasche2014-01-241-7/+22
| | | * Stop SDP search if QML Model is turned offAlex Blasche2014-01-222-3/+5
| | | * Add missing documentation for QQmlNdefRecord::Unknown enum value.Alex Blasche2014-01-221-0/+1
| | | * Do not clear result lists while the SDP search is ongoing.Alex Blasche2014-01-201-1/+6
| | | * Improve QBluetoothServiceDiscoveryAgent documentationAlex Blasche2014-01-201-16/+34
| | | * Cleanup dead code in Bluez SDP discovery backendAlex Blasche2014-01-201-12/+4
| | | * Fix memory leaks in Bluez specific device and SDP discovery classes.Alex Blasche2014-01-202-3/+18
| * | | Normalize signal & slot signatures in connectionThiago Macieira2014-02-034-9/+9
| * | | Misc fixes for the new corkboard exampleAlex Blasche2014-02-032-0/+4
| |/ /
| * | Add documentation for picture transfer example and minor QML fixesAlex Blasche2014-01-282-1/+5
| * | 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-2014-18/+18
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-172-18/+5
| |\|
| | * 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
| * | 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
| * | 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