summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Refine documentation for QBluetoothSocket::localXYZ() functions.Alex Blasche2014-01-281-1/+12
| | | | | | | | Bluez never returns anything until the connection has been established. BlackBerry and the future Android port are much quicker. Change-Id: Ic465a9b68176e7fff5f0c88b4fb602f8665f7197 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Initialize QBluetoothSocket::socketError properly.Alex Blasche2014-01-282-0/+2
| | | | | | | | | So far the initial value is compiler dependent. In most cases this meant it was set to 0. However 0 is not even a valid QBluetoothSocket::SocketError enum value. The NoSocketError value is -2. Change-Id: Ieee4f7bd1c97d758295f4d0cc1297f62c114f4f3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix crash in Bluez implementation for QBluetoothSocketAlex Blasche2014-01-281-2/+3
| | | | | | | | | | | | | The internal socket was closed but not reset to -1 after calling close() or abort(). As a consequence the subsequent connect() call crashed since internal socket notifier were invalid [ChangeLog][QtBluetooth][QBluetoothSocket] Fixed a crash in Bluez part of QBluetoothSocket() which was caused when triggered when calling the sequence connect() - abort() - connect(). Change-Id: I21b779c7808d0a5211df9e2481da28e2e9753ca9 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix broken SDP discovery on QBluetoothSocketAlex Blasche2014-01-282-2/+4
| | | | | | | | | | | | | | | | ThHis is only used on Bluez at this stage. THe SDP agent was initialized with the local adapter being the remote address of the remote service. This could never work. The remote address is now properly set (being the handed over bt address to QBluetoothSocket::connectToService()). [ChangeLog][QtBluetooth][QtBluetoothSocket] Fixed incorrect invocation of QBluetoothDiscoveryAgent where the remote service address was incorrectly assumed to be the local Bt adapter address. This prevented the detection of the remote service. This bug only affects the Bluez backend. Change-Id: Ice2b9c351bfd42f1f4398b14ac68f76315f01fa8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix crash during SDP discovery on BluezAlex Blasche2014-01-241-7/+22
| | | | | | | | | | | | | | Stopping the discovery during an ongoing SDP search may cause a crash because discoveredDevices has been cleared although we still access the list later on. Even if list access wouldn't be required anymore there is no reason to continue the discovery. Entry guards for the involved slots were added. Additionally it revealed a memory leak which has been fixed Change-Id: I3fd3c99a82a9d7b61e853a3f9f3877b8ad7f6d41 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Stop SDP search if QML Model is turned offAlex Blasche2014-01-222-3/+5
| | | | | | | | | So far, we only ever disabled the device search. If a SDP discovery was running and we changed to device discovery the SDP discovery kept running in the background. Change-Id: I5f2cf88ecf7f9b5cfe2608e0ceda366b552982e5 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Add missing documentation for QQmlNdefRecord::Unknown enum value.Alex Blasche2014-01-221-0/+1
| | | | | Change-Id: Ida3f7816340f9379629e653abc5ef89f5aa38486 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Do not clear result lists while the SDP search is ongoing.Alex Blasche2014-01-201-1/+6
| | | | | | | | Or bad things will happen... Change-Id: I7df3925ff5d15f3f904f4dd38e24b247ec151fd1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Improve QBluetoothServiceDiscoveryAgent documentationAlex Blasche2014-01-201-16/+34
| | | | | | | | | [ChangeLog][QtBluetooth][QBluetoothServiceDiscoveryAgent] The QBluetoothServiceDiscoveryAgent class documentation has been improved. Change-Id: I5472e9ceda45d9bcf0634b5bf2cecf265986bc10 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Cleanup dead code in Bluez SDP discovery backendAlex Blasche2014-01-201-12/+4
| | | | | | | | The change tweaks the discovery debug output log too. Change-Id: I4ef3e2e8ebaf0d9e593eee35a669641e3914da01 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix memory leaks in Bluez specific device and SDP discovery classes.Alex Blasche2014-01-202-3/+18
| | | | | | | | | | [ChangeLog][QtBluetooth][Platform Specific Changes] Memory leaks fixed in Bluez device and service discovery implementations. Change-Id: Ibc7c883d42d81a97310ff44ba40ffa94c71f611f Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Cleanup more duplicated code in SDP discovery class.Alex Blasche2014-01-171-16/+5
| | | | | Change-Id: I4b6be592204cc435bfec508725d64cb8f7529a3b Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Reduce SDP discovery debug output on BluezAlex Blasche2014-01-171-2/+0
| | | | | | | | | Printing the entire SDP xml is just too verbose. This reduces the output by multiple pages. Change-Id: I08ffb7799f3c9f5a61de224e58e565719d44b81b Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-084-19/+30
| | | | | | | | Add some minor include cleanups as well. Task-number: QTBUG-32253 Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix remaining compiler warnings in QtConnectivity moduleFabian Bumberger2014-01-073-4/+3
| | | | | Change-Id: Iafadb39642c6b2944e8a873bdee49fb87e3ed5e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't set the internal service discovery state twice to the sameAlex Blasche2014-01-071-2/+0
| | | | | | | | The first call is not necessary as nothing has changed in the meantime. Change-Id: I8db51fd725dd210b3d5c7b01d399d24877bf9b2f Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Translate so far untranslated error strings.Alex Blasche2013-12-203-7/+7
| | | | | | Change-Id: I7d91404052ce987ea700e698c024475211bad025 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-2022-225/+188
| | | | | | | Task-number: QTBUG-32253 Change-Id: I193162407d0fc7eca83689e31f03e1641a494ab0 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve error reporting.Alex Blasche2013-12-202-1/+6
| | | | | | | | | | | | | Whenever we emit an error, we should set the human readable error string in the discovery classes. [ChangeLog][QtBluetooth][Documentation] Fix cases where device and service discovery classes emitted an error signal but the human readable error string was not adjusted. Change-Id: I9680853d17d2ee4bc1293826bb7bf56cc999e2ed Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix a dangling pointer use in QBluetoothServiceDiscoveryAgent on QNXRobin Burchell2013-12-051-4/+4
| | | | | | | | | toUtf8 returns a temporary, we must not use a pointer inside it without making sure that the QByteArray returned sticks around. Change-Id: I4566d14f52acac083433dfe63c64365d119bbd17 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Unwarn on clangv5.2.0-rc1v5.2.0Alex Blasche2013-11-111-5/+3
| | | | | | | | qdeclarativebluetoothservice.cpp:279:14: warning: variable 'serverType' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] Change-Id: I67e6e58c7729d09492a7913e83b4bc94acf5d057 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I8ee21679bc4990bb8c81d8e4a7233d7ec2824ba7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Build Bluetooth and NFC only for BlackberryAndreas Holzammer2013-11-012-2/+2
| | | | | | | | | Plain QNX does not need to have Bluetooth and/or NFC. Change-Id: I6323d03292a2b72d21f8d947bb58205648cb0061 Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | Change-Id: I14e289bd44ab31fff081d5d63974e524232313a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Fix module name formatv5.2.0-beta1Sze Howe Koh2013-10-213-3/+3
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Task-number: QTBUG-33360 Change-Id: I51f23e4b3ac0dffe8fef674f2cb431776d5829ab Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove not needed error enum and avoid future enum value collisionsAlex Blasche2013-10-153-7/+5
| | | | | | Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update Bluetooth QML meta data for Qt CreatorAlex Blasche2013-10-151-7/+16
| | | | | | Change-Id: I50ae4f34e1d737c59ff0e15e940e0e6484412271 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: language and style review doc qtconnectivityNico Vertriest2013-10-149-25/+28
| | | | | | | | Reviewed doc Bluetooth and NFC Task-number: QTBUG-32173 Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-148-8/+8
| | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Update Nfc QML meta data for Qt CreatorAlex Blasche2013-10-141-25/+33
| | | | | | Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-149-15/+20
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QtBluetooth QML API starts with 5.2.Alex Blasche2013-10-146-12/+21
| | | | | | | | 5.0 remains as silent import though. Change-Id: I06c839a1224dc0d8b019bd99e354245f829ae750 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix unit test error in qndefrecord.Alex Blasche2013-10-112-14/+12
| | | | | | | | | | | The typenameformat signal was not always emitted due to insufficient logic associated with first time initialization of QQmlNdefRecord. This error only happened when the compiler didn't initialize QNdefRecordPrivate::typeNameFormat to 0. Change-Id: Ieba0a1d7c940c40980ff455ca5c1665c298c0527 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update QML type description for Bluetooth QML API due to API changes.Alex Blasche2013-10-111-32/+14
| | | | | | Change-Id: I30ae8567823e9d48a51654f18048bf66babc6e5a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Document the data roles offered by the BluetoothDiscoveryModel.Alex Blasche2013-10-111-3/+25
| | | | | | Change-Id: Ifba68d1980f6eedd030db38836be5a2d62a224b2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* BluetoothDiscoveryModel API fixesAlex Blasche2013-10-112-15/+12
| | | | | | | | | | | | | - rename signal: newServiceDiscovered -> serviceDiscovered - rename signal: newDeviceDiscovered -> deviceDisovered - add parameter to deviceDiscovered signal - improve documentation for above signals - minor example fixes Task-number: QTBUG-33678 Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove the "registerNdefMessageHandler" template function and doc fixesAlex Blasche2013-10-112-12/+1
| | | | | | | | Too much syntactic sugar and qdoc has problems recognising it as well. Change-Id: I99f482426f537a8d3c0099edc3c393676424afec Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve handling of invalid Bt address by QBluetoothTransferManagerAlex Blasche2013-10-112-2/+19
| | | | | | | | | Some minor unit test improvements Task-number: QTBUG-33801 Change-Id: Idc98bf8928ced0f9e01b24668edf7c32172d2fd1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make the QBluetoothTransferRequest constructor explicitFabian Bumberger2013-10-111-1/+1
| | | | | Change-Id: I973ffedf6dc0c5b7215c9e99f5fb4bcb96ea6084 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix Bluetooth doc errors.Alex Blasche2013-10-102-8/+4
| | | | | | Change-Id: I2ed67e0989eb8fe2c2c63def2654c6db2805c94a Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix MSVC64-warning about truncation from size_t to int.Friedemann Kleint2013-10-101-1/+1
| | | | | Change-Id: I592a6bf4396ff2fc587527fe4faf1093d9ea4f57 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix update progressFabian Bumberger2013-10-081-4/+8
| | | | | | | The string format can only be converted to a double for very high numbers. Change-Id: I20e284eb24761dcb11a4777baf37782752b95bb6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix QDeclarativeBluetoothSocket stringData propertyAlex Blasche2013-10-062-27/+9
| | | | | | | | Task-number: QTBUG-31729 Change-Id: Idd820e57b72c2293c999bdc0a578d1e8f8e5471b Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Rename QDeclarativeNdefRecord -> QQmlNdefRecordSze Howe Koh2013-10-0417-105/+105
| | | | | | | | | | | The QDeclarative* class prefix is associated with the now-deprecated Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all QDeclarative* classes have been renamed to QQml* or QQuick* Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Change the service properties in btchat exampleFabian Bumberger2013-10-012-2/+8
| | | | | | | And adding some links to the documentation. Change-Id: I7f9baf6a648547ef028f9521b0d88b88267fa301 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix socket connection with a service info objectFabian Bumberger2013-10-012-3/+7
| | | | | Change-Id: Ib33787c849ba4370bb9e99a6cc50ce30ce216f0c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix uuid filter in service discoveryFabian Bumberger2013-09-301-1/+1
| | | | | Change-Id: I5493be50f66cf8df8fac1177b885c395a6d697b6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't throw an error when a low energy device is discoveredFabian Bumberger2013-09-301-4/+11
| | | | | | | Just ignore it Change-Id: I7d8139f8c10cee0df4e2ebdc13bb76ee6bb8dda3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QML Near Field: Allow detecting NDEF messages without setting a filterFabian Bumberger2013-09-301-7/+5
| | | | | Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-306-58/+146
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 04:56:49 +0000