summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix crashing btchat example when selecting remote devicev5.4.15.4.1Alex Blasche2015-01-296-59/+69
| | | | | | | | | | | | | | | | | The example immidiately destroys the QBluetoothServiceDiscoveryAgent when the user selects a remote chat service from the remote selector dialog. This may happen even when the scheduled QtConcurrent call to runSdpScan() was still pending. The subsequent signal callback into the deleted parent caused a crash. Unfortunately QtConcurrent::run() returns a QFuture which does not permit stopping the pending thread execution. Therefore the runSdpScan() had to be rewritten using QProcess to properly destruct pending calls. Change-Id: I1ed5e147feb94a26240901a02d836056eddabbf6 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add changelog for QtBluetooth/QtNfc 5.4.1 release.Alex Blasche2015-01-291-0/+38
| | | | | Change-Id: I1f4f3ace78b4619a43581182d885c479314a7603 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Register PublicBrowseGroup as sequenceAlex Blasche2015-01-212-2/+6
| | | | | | | | | | | | | | | | | | Based on Bluetooth spec Vol3 PartB 5.1.7 the BrowseGroupList consists of a data element sequence. The current approach was not correct. This was discovered because Bluez5 doesn't add a custom service to the Extended Inquiry Response (EIR) unless it is in a sequence. If the service is not part of the EIR other platforms such as Windows report an error or won't simply see the service. This was not a problem when using Bluez4 because it was more tolerant towards such mistakes and added the custom service to the EIR anyway. Task-number: QTBUG-43806 Change-Id: Ib0ca59005c940249fb6aefd8ecafe5b2ceff3878 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Make chat example more error tolerantAlex Blasche2014-12-223-1/+16
| | | | | | | | It becomes more obvious on platforms which do not support Bluetooth that the example will not work. Change-Id: Ia6d249a4a891f93abf29910500ba164662308889 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | Change-Id: Ic018bf8b03e887da5448e0bcd6fdb18219fad184
* Improve documentation for undiscovered QLEServiceAlex Blasche2014-12-011-1/+14
| | | | | | | | | The class' behavior strongly deponds on its state. This can be confusing. This patch reduces the behavior uncertainties. Change-Id: Ib5cd8e821f2bb9aca5b579abf4ae98918f951f24 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-276-17/+45
|\ | | | | | | Change-Id: I3f85a68066352e0b163f47d2b8ada1d0b8d34f33
| * Fix crash during service discovery on Androidv5.4.05.4.0Alex Blasche2014-11-211-13/+11
| | | | | | | | | | | | | | | | | | | | This is caused when running a service discovery on an Android emulator. The emulator does not have a local Bluetooth device despite the Qt code assuming it. Change-Id: I9c0d826d14e7494bfeb27d449f9b6f568860d917 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add missing InvalidBluetoothAdapterError to QML discovery modelAlex Blasche2014-11-215-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | QBluetoothServiceDiscoveryAgent::InvalidBluetoothAdapter was introduced by Qt 5.3 but never added to the QML BluetoothDiscoveryModel. This patch fixes the problem. This was noticed due to a crash on Android emulator. Change-Id: I652576929659ca370216133154e36158e8425711 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Improve lowenergyscanner status reportingAlex Blasche2014-11-244-10/+10
| | | | | | | | | | | | Change-Id: If6fccce951c2f3c3787cde2fa593e65da26f4370 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Reset the controller's internal state when disconnectingAlex Blasche2014-11-233-0/+14
| | | | | | | | | | | | | | | | | | | | This caused problems when disconnecting from the remote device while an openrequest was pending and if the controller tried to reconnect immediately afterwards. The pending request queue was blocked forever. Change-Id: I444d5ac6763b65ec8baf687e0dccec4b28016a6c Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-214-2/+108
|\ \ | |/ | | | | Change-Id: Ib79fe0b33b405cdf6fee87f97f6ebb86bb79d976
| * Fix spelling mistake in change logsv5.4.0-rc1Alex Blasche2014-11-181-1/+1
| | | | | | | | | | Change-Id: Ia82082ce24c98b69697b348dc20164b8ec034a0b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Add change log for Qt 5.4.0 releaseAlex Blasche2014-11-171-0/+99
| | | | | | | | | | | | | | Change-Id: I9eca03f01ba01e9952c28c6d4bd14f656aa5d838 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add missing \since tags for new API introduced by Qt 5.4.Alex Blasche2014-11-133-2/+9
| | | | | | | | | | | | Change-Id: Ie51d6e549d80baae57864d4e0d43a1c58897f149 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | More clearly specify the Linux and Bluez version for BTLE supportAlex Blasche2014-11-131-2/+1
| | | | | | | | | | | | Change-Id: If62bce8794855b8865e02ed87ec3faac80bfc3bd Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix QLEController::connectToDevice() documentationAlex Blasche2014-11-111-1/+3
|/ | | | | | | | A logical condition was inverted. Change-Id: Ia7b54fe75a8cea4275e3c92c6283bc12f3423b64 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Force lowenergyscanner to show empty list if we did not find servicesAlex Blasche2014-10-301-0/+3
| | | | | | | | | | Previously the UI was only updated when a new service was discovered on a device. In the extremely rare event of no services being found the UI was hanging in the "Searching for services" view. Change-Id: I245216ac4e373a765dea2e182ab541e8830417d0 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix lowenergyscanner ui bugs when QLEController connection errorsAlex Blasche2014-10-293-1/+28
| | | | | | | | | | | | | | | | | | 1.) The QLEController may error out during connectToDevice() which does not require the eventloop to run. At the same time the services view is not yet loaded. Subsequently the services view never notices the errors and loads as if the controller is still trying to connect. 2.) The services view can only be left when a disconnect() signal is received. During a connection error the disconnect never happens because the connect never happened. Artificially introduce a disconnect() when the controller is not connected but disconnect was called by the UI. This part should be cleaned up to properly allow tracking of the controller's state in the future. Change-Id: I2cbd90d55b5e70fb275a8f4563d9436419874e6d Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* If btle connect attempt fails return QLEController back to UnconnectedAlex Blasche2014-10-291-1/+3
| | | | | | | | | What is really needed is a new ConnectionError for this case. This new error will shortly be introduced to the btle/5.5 branch. Change-Id: I751fa0eeb5cf4d0b78863842c94770f4e8e74015 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix lowenergyscanner when dealing with device scan errorsAlex Blasche2014-10-283-4/+16
| | | | | | | | | Previously the error was indicated but other UI elements were still giving the impression that the scan was ongoing. Change-Id: Iafab8f43bff3303eb6ad5e3385db2f81288d2e66 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Unwarn compile of QtBluetoothAlex Blasche2014-10-281-1/+1
| | | | | | | | warning: 'QLowEnergyDescriptorPrivate' defined as a struct here but previously declared as a class [-Wmismatched-tags] Change-Id: I2b90a645ed5aa2d86184d94acb2658460f26f660 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add QBluetoothDeviceInfo::UnknownCoreConfiguration enum valueAlex Blasche2014-10-163-2/+10
| | | | | | | | | | | | The value is needed for platforms which do not provide this type information. An example are Android versions below 18. The enum was added in Qt 5.4. Therefore we need to add the missing \since tag too. Change-Id: I23582e7500d8da6740b281ba9821d028c4f33e05 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve QBluetoothTransferManager documentationAlex Blasche2014-10-163-8/+29
| | | | | | | Change-Id: I918bd3b4134504d5bfc3e160adeb97187186df3d Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Catch segfault when passing 0 to QBluetoothTransferManager::put()Alex Blasche2014-10-133-0/+33
| | | | | | Change-Id: I8c659233fd6eb2232d7bd9d904ce14f1de8a9d34 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix QBluetoothSocket unit test failures on AndroidAlex Blasche2014-10-132-8/+23
| | | | | | Change-Id: Ib8800fa30c74678c74df9ed943b143ea4cf49bb2 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix QBluetoothSocket::isReadable()/isOpen()/isWritable()Alex Blasche2014-10-135-19/+47
| | | | | | | Change-Id: Ifd6b5ed8176aa7959ed8da0edc762266aa2bd6fa Task-number: QTBUG-32704 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QBluetoothTransferReply - fix a memory leak.v5.4.0-beta1Timur Pocheptsov2014-10-102-8/+8
| | | | | | | Fix a potential memory leak in _bluez and _qnx versions of copyToTempFile. Change-Id: I4c21d25b88620747adaaea8f2da561ca0b3d5df6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve QBluetoothSocket::close() documentationAlex Blasche2014-10-101-0/+9
| | | | | | | | | | The disconnected() and stateChanged() signals are delayed which may easily overlooked by API users. This change specifically points out this behavior difference. Change-Id: I3a9e9c656da50c9efe455cd2dbf903a2849e36da Task-number: QTBUG-41770 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Applied title case to section1 titlesNico Vertriest2014-10-093-5/+5
| | | | | | | Change-Id: I4bf466a3f6c34b338f741ec003343b572e73d738 Task-number: QTBUG-41250 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Improve QML Chat example UIAlex Blasche2014-10-0510-51/+36
| | | | | | | | | This makes the example more compliant with general UI color guidelines and cuts out unnecessary code. Change-Id: I1cf7df602e586a667ebd052ed45baef8eafb6955 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Add new QML Chat example to Bluetooth module example listAlex Blasche2014-10-021-9/+12
| | | | | | | | | The change makes a few minor cosmetic changes (e.g. sorting by alphabet and better descriptions) to the overview page too. Change-Id: I20c6e4735dd531b457fdf52b59f00e8a285a7397 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Remove nfctestserver test applicationAlex Blasche2014-10-018-609/+0
| | | | | | | | | It is realted to nfc socket streaming which we don't support at this stage. Change-Id: Idae80decad7aa2cdf7eb67b82ddc3e20384df8b8 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix QBluetoothServiceInfo uni test on platforms using fake server portsAlex Blasche2014-09-302-6/+56
| | | | | | | | | | Those platforms require a running QBluetoothServer to satisfy the prerequisites of calling QBluetoothServiceInfo::registerService(). This requirement is imposed by the public API contract anyway. Change-Id: I2498030fa2787df9745580cd744886693945fe4f Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Android: Fix broken QBluetoothServer::isListeningAlex Blasche2014-09-301-1/+1
| | | | | | | | | | | | | | | | | The function didn't return true right after calling listen(). This is caused by the fakeserverport implementation. On Android listen() doesn't really initiate the listen until QBluetoothServiceInfo::registerService() was called. We need to check the fakeServerPort registration to check whether we are listening already. [ChangeLog][QtBluetooth][Android] Fixed broken QBluetoothServer::isListening(). It returned false right after a successful call to listen(). Change-Id: I24de02602b401ecbbedaafd19d824170a181e03f Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Provide example documentation for new chat example.Alex Blasche2014-09-304-3/+103
| | | | | | Change-Id: I073b0b4432d7e51516584aa1d23c681bb8544392 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* New QML based Bt chat clientAlex Blasche2014-09-3015-2/+600
| | | | | | Change-Id: I235c54591dbbf04aa58c024093beca8c068b4aed Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Extend docs on Minimal SDP discoveryAlex Blasche2014-09-301-4/+10
| | | | | | Change-Id: If1add78a34f4d01313e022bd7af1d53ac2abd535 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update image for NFC poster exampleAlex Blasche2014-09-291-0/+0
| | | | | | | Change-Id: I9dfff5fbbb8ce939de37fcf1b4f03fd7569b9203 Task-number: QTBUG-36496 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Fix tr()-context in src/bluetooth/qbluetoothservicediscoveryagent_qnx.Friedemann Kleint2014-09-291-1/+1
| | | | | Change-Id: I161cac536d261c517a8323777561f8380b7d4bfb Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QtBluetooth : pingpong example on OS XTimur Pocheptsov2014-09-261-12/+12
| | | | | | | Re-order some declarations to make the example work on OS X. Change-Id: I9e74ce7b19a3d749f6ba0f951c1ce013f42729f7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't permit write of non-existing or empty data via socketAlex Blasche2014-09-261-0/+7
| | | | | | Change-Id: Ic8387dd411a9784b6163a15d423cdeaa5e63ea30 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix pingpong exampleAlex Blasche2014-09-262-3/+3
| | | | | | | | | | | | | | | 1.) ElidedMiddle makes the text disappear on Debian and Ubuntu. Swapping elide mode to wrap mode which serves the same purpose 2.) The server was started as rfcomm channel but the client used L2Cap protocol. It may have worked anyway because rfcomm is based on l2cap. In any case this shouldn't be relied upon especially since some platforms don't support l2cap sockets as part of the public API offering. This way the example becomes more widely usable. Change-Id: Ibbcd7029d5843e86af0313037b6433017eb92c76 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add \since tag to NFC classes which didn't have the tag yetAlex Blasche2014-09-269-0/+9
| | | | | | | | Internal or not yet released classes have been skipped Change-Id: I5bc3e08f87348ae8df61b923d7cdb81186ebebc8 Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Add \since to all Qt Bluetooth classes which didn't have the tag yetAlex Blasche2014-09-2614-0/+28
| | | | | | Change-Id: I50d818294cb53962bca2b08edbfdc4558890777c Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Make it more obvious that QLowEnergy* classes are Tech previewAlex Blasche2014-09-264-0/+12
| | | | | | | | Although no larger changes are expected the QLowEnergy* classes only provide a limited API commitment. Change-Id: I244403b8818c2b34a97c8d6f2633e4b94646e49b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QNX/BB10 fix build failureWolfgang Bremer2014-09-221-1/+1
| | | | | | | service was not declared, it should be lowEnergyService Change-Id: I1419dbaa865b0bcce51ad2e8cf13c24cef40f1fa Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove not needed invokeMethod() calls when emitting finished() signalAlex Blasche2014-09-193-13/+19
| | | | | | | | | | | Internally the transfer reply starts via QueuedConnection. Therefore the finished signal doesn't have to be delayed even further. In addition document the tight restriction when being interested in signals from QBluetoothtransferReply. Change-Id: I0358140e96e1e9709158310c493f34ea5e40582a Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add missing error() signal to QBluetoothTransferReplyAlex Blasche2014-09-186-8/+47
| | | | | | | | | | | | The signal makes error handling much more conveniant. One error situation on QNX did not emit the required finished()/errorType() signals when required. A few minor typo fixes. Task-number: QTBUG-38983 Change-Id: I89c3fbee43921c8894a0ab200ee5550e7dc44543 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-170-0/+0
|\
View Lorry Controller Status