summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* fix example installsOswald Buddenhagen2016-04-283-6/+13
| | | | | Change-Id: I8fb3a8f61a7007dec6935eee3bd5ff25cd756395 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* purge unreferenced .ui fileOswald Buddenhagen2016-04-281-21/+0
| | | | | Change-Id: Iacc97b5b32d6ad77e02a65c7597310116efdeeec Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Increase test coverage in bttestuiAlex Blasche2016-04-281-1/+1
| | | | | | | | | | QBluetoothSocket::connectDevice(QBluetoothServiceInfo, OpenMode) was not used so far. This call is even more efficient as it can avoid a complete service discovery. In summary quicker testing can be achieved. Change-Id: I6f9ef9eec6b773b9b90bf46e24a07878d81633cd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Improve QBluetoothServiceDiscoveryAgent::setUuidFilter() docsAlex Blasche2016-04-271-1/+6
| | | | | | | | | | Better explains that the uuid filter is applied against two service attributes rather than only one. The ServiceId and the ServiceClassIds are used for matching purposes. Change-Id: Ib301e438c27977288c56a2bb9dfe68e2d3f2a10d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Peripheral Privacy Flag (0x2A02) may not be writable on some platformsAlex Blasche2016-04-271-2/+1
| | | | | Change-Id: Ic80fe48fb192ee66f87aabcebc2b84e4ed3049a0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Improve QBluetoothUuid(QString) ctor documentationAlex Blasche2016-04-261-3/+6
| | | | | | | | | It highlights the optional curly braces and the connection to QUuid. Task-number: QTBUG-52685 Change-Id: Iebfa84dc7f83fd2ef0aa02cb5e21b3f62de84d24 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* Fix typo in Android permission nameAlex Blasche2016-04-131-1/+1
| | | | | | Task-number: QTBUG-52530 Change-Id: I6ae41b3f8998ffc18d8b8205c6bbe788e8c4898b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-132-5/+6
| | | | | | | | | | | | | | | | | Android does not provide an API to detect when an NFC tag is removed from the vincinity. To detect such a case the Android implementation uses active polling. During each polling cycle the implementation connects and disconnects from the tag. If it failed, the tag is assumed to have been removed from the vincinity. Such failed attempts cause an IOException which are printed to stderr. This is confusing as the developer might mistake them for some other serious problem. This change suppresses all related warnings. Change-Id: I95cf57076139e7d0a5ad31d4cc770a81ced12242 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix Annotated URL Example on AndroidAlex Blasche2016-04-133-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | QNearFieldManager::registerNdefMessageHandler() is supposed to register the current app as platform handler for certain tag types. The example is written around this concept and doesn't start the target detection when such a registration succeeded. Unfortunately the Android implementation does something completely different. Therefore the startTargetDetection() and connect() calls after the current return is necessary to make the example useful. For now we simply ignore the feature and always start target detection. Since neither NEARD/Linux nor Android (the only two supported platforms) have an implementation for the feature the modified example works as expected. Considering the current state it should be considered to remove this NDEF message registration feature in Qt 6 altogether. The only platform which ever supported the feature was BB10 and its implementation was removed a long time ago. Task-number: QTBUG-52154 Change-Id: Ibef9e77ac33b9629b6d81aa70eaa01ab1702cfcb Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Android: Ensure Bluetooth device discovery finds remote devicesAlex Blasche2016-04-132-1/+4
| | | | | | | | | | | | | | Since Android 6.0 Bluetooth device discovery requires new permissions (ACCESS_FINE_LOCATION or ACCESS_COURSE_LOCATION). Otherwise non-BTLE devices will no show up anymore. This patch adds the required permissions to QtBLuetooth. For details see http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-hardware-id Task-number: QTBUG-52530 Change-Id: I7b64ab57c5c9ee2e08308eaa58d33708c5e31244 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Document changed behavior of QBLD::address() on Android 6.0Alex Blasche2016-04-131-0/+4
| | | | | | | The address was fixed for privacy reasons. Change-Id: Ifbdcb88d84215601bd202c0835237bb1c3100ca3 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* OSXBTCentralManager - fix details discovery (iOS/OS X)Timur Pocheptsov2016-04-041-1/+1
| | | | | | | | | -serviceForUUID: fails to find included service and returns a nil for a valid service previously discovered. Task-number: QTBUG-52324 Change-Id: I9f4f8b1f3d3a78879344ace0170e23c03921d648 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Spelling fixFrank Meerkoetter2016-03-231-2/+2
| | | | | Change-Id: I4bcaa2d27d0ac4c9d3ed5fc3800392ba73e77a89 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2212-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I621cb2437578c3f8a658e7c26a4de045825147ce Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-223-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I2b8810829f1b91033539229a6d4b3e505b8730ea Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| | | | | | | | | Use Q_GLOBAL_STATIC instead of simple static QMap object to avoid problems with undefined initialization order for 'statics' from different translation units. Task-number: QTBUG-51860 Change-Id: I6ce48f3c0770dc0ff125b443816f6b3b23ae809e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add explicit and make public headers compile with ↵Marc Mutz2016-03-1516-27/+26
| | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* don't over-expose private dependenciesOswald Buddenhagen2016-02-252-7/+7
| | | | | Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-252-4/+3
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-153-267/+91
|\ | | | | | | Change-Id: Iabf0939a5f23c5da85de3a73545cd8abdc9a3e65
| * Update qml types for QtConnectivity 5.6.0 releasev5.6.0-rc1v5.6.0Alex Blasche2016-02-052-267/+2
| | | | | | | | | | Change-Id: Iadd9905f4129ede5f0c06b1e1a88a8f932c37c70 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-021-1/+8
| |\ | | | | | | | | | Change-Id: I25358eae40c07d8e5ba1224b3508c5fee95d3a85
| * | Add changelog for QtBluetooth/QtNfc 5.6.0 releaseAlex Blasche2016-01-261-0/+89
| | | | | | | | | | | | | | | Change-Id: I1422ab23ef1abd812eb5523105cbadc8ef1aa015 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | | Update gitnignore following recent changes in the build systemAlex Blasche2016-02-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The build system generates wrapper scripts for direct host tool calls. This scripts should not be tracked by git. Change-Id: I9b2c9521c2c12e38f32ae69621d72e18eb33945b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ |/| | | | | Change-Id: Ie993ef22029b1d05f39e4edc8f859841790ca6a6
* | Not all descriptors where discovered in some casesOleksii Serdiuk2016-02-021-1/+8
|/ | | | | | | | | | | While discovering descriptors, when handles are not numbered sequentially, the discovery stopped as soon as "no attribute in given range found" error is received. However, there could be more characteristics pending. As a result, descriptors for those characteristics where never discovered. Change-Id: Iad9d7203020b0787f1d4571fc7063ef390448ce9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Bluetooth: Do not assert on remote data.Christian Kandeler2016-01-221-1/+6
| | | | | | | Otherwise, a malicious device could crash our application. Change-Id: I427eb1ff88b08710d5c74230f5877b0c59b6fb0f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Document QtBluetooth and QtNfc logging categoriesAlex Blasche2016-01-152-0/+40
| | | | | Change-Id: Ib5a9f4e5c0eef85a1acd93454d842bbb0d615751 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix qdoc warning about missing dtor documentation in QQmlNdefRecordAlex Blasche2016-01-151-0/+3
| | | | | Change-Id: Ic1f3ca5075174addfbc6d76f31d9b89d2c654d19 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Bluetooth: Fix mapping of device address to HCI id.Christian Kandeler2016-01-151-1/+1
| | | | | | | | The previous code always returned the id of the first device in the list. Change-Id: I6f3cde2405d53eab009d7409d9e3c6b47d97e53b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Bluetooth LE: Fix premature initialization of HCI manager.Christian Kandeler2016-01-155-4/+20
| | | | | | | | The private class used a member in its constructor that was only set afterwards. Change-Id: I19b7ca2a5048771a447d63a56ad10ad56c311e91 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix typo regarding requiresAndy Shaw2016-01-081-1/+1
| | | | | Change-Id: I59c6344b1c1ab0c892d8c66a7348f8321e3a603e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Android: Fix QBluetoothSocket::bytesAvailable()Alex Blasche2016-01-072-2/+2
| | | | | | | Task-number: QTBUG-50345 Change-Id: I721b98f9b6ccff2a987a6c477d08902332ce848c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove yet another implementation of AutoreleasePool's RAIITimur Pocheptsov2016-01-051-2/+1
| | | | | | | Now we have this class in QtCore, no need in my "home-made" version anymore. Change-Id: Id26944dd6970cc2a8ac9d02675f8af9adecc3d44 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Bluez5: Sanitize app name to be valid DBus object path nameAlex Blasche2015-12-234-2/+26
| | | | | | | | This may happen when the app name contains for example a dash ('-'). Task-number: QTBUG-49402 Change-Id: I04b289b0723e2979a67c93e335205556bf1eb30e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Handle undefined QLowEnergyController error cases as Unknown errorAlex Blasche2015-12-231-0/+1
| | | | | | | | | This is important on Android as not all error conditions are exposed via QLowEnergyController::Error enum. Change-Id: I442ecffcadc01e1a2b60ae17dc6e63e08e5f4149 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix inconsistent use of 'override'.Erik Verbruggen2015-12-231-1/+1
| | | | | | Change-Id: I3addd4258e3bbb5aaa6eca21af338aab57b9cf33 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Remove deprecated 'register' storage class specifier.Erik Verbruggen2015-12-231-1/+1
| | | | | Change-Id: Iec9163b25f961a5f7371150aba17a892e5fac305 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Android: Invalidate services after a disconnect from the peripheral sideAlex Blasche2015-12-231-0/+8
| | | | | | | | | | So far, invalidation only took place when the local/central side disconnected the connection. Task-number: QTBUG-50125 Change-Id: Ic01725d1b83e49ad7df6971d980b480f839d550b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove unused isConnecting member variable in QLECPrivateOSXAlex Blasche2015-12-232-19/+6
| | | | | | | | | Most likely it was used before some changes rendered it unused. At this point the variable was initialized to false and never ever set to true. Change-Id: I5b60cf83bc362ff53f8ce276c16392aada9efc69 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* OSX/iOS: Invalide QTLE services when remote device disconnectsAlex Blasche2015-12-231-0/+1
| | | | | | | | So far, only a local disconnect triggered the invalidation process. Task-number: QTBUG-50125 Change-Id: I324e01c86eb0c7cc820e91a6f6d6d01fb23170ab Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Fix namespaced build on OSX.Erik Verbruggen2015-12-231-2/+2
| | | | | Change-Id: I0baa4bbbc5d398f388a1e0aff9ba88f82a23c1cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* disable build on android if androidextras is absentOswald Buddenhagen2015-12-211-0/+2
| | | | | | Change-Id: Iefea81376d0486aead874dad985e55f0b0af5d27 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Properly initialize the m_manager pointer.Frank Meerkoetter2015-12-181-0/+1
| | | | | | | Fixes coverity CID22012. Change-Id: Ifdadf0330c277aeea6f87bacd986ec15d5a0c144 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix missing breakFrank Meerkoetter2015-12-181-0/+1
| | | | | | | Fixes coverity CID21692. Change-Id: I6c4d464c54caae826cef1af25334a03037971ef8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix resource leak.Frank Meerkoetter2015-12-182-0/+6
| | | | | | | | Do not leak the private object. Fixes coverity CID21656. Change-Id: I19873364afeb4f8244c2f436129ad82d83491a2a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add "we mean it header statement" to osx private headerAlex Blasche2015-12-151-0/+11
| | | | | Change-Id: I4005833edebd10b778ac06ded49a88e633e5f435 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Bluetooth: Fix undefined behavior in example.Christian Kandeler2015-12-151-7/+9
| | | | | Change-Id: I85312373f8feca9f117faf8c4b0f0f517c33e9f3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Bluetooth: Documentation fix.v5.6.0-beta1Christian Kandeler2015-12-141-4/+4
| | | | | Change-Id: I095fbdfff6ba753c5c9bfbf204b3ac70d8108376 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* qlowenergycontroller_osx - move delegate to the qt_LE_queueTimur Pocheptsov2015-12-107-376/+613
| | | | | | | | | | | | | | | | | | | | | | | | | ATM CBCentralManager's delegate does its work on the main queue. With CoreFoundation event dispatcher it's now possible to use QtBluetooth from non-gui thread (more generally - from a thread other than main). This makes main queue useless - and we have to move to a dedicated dispatch queue. Also, we have to make sure we do not have race conditioins/dead-locks. This patch: 1. decouples OSXBTLECentralManager and QLowEnergyController so that these two objects working (potentially) on different threads do not share any data and do not have to use locks, removes the explicit 'delegate' interface/inheritance and replaces them with LECentralNotifier class - to be able to use Qt's signal/slot mechanics for inter-thread communication. 2. all OSXBTLECentralManager's are now executed on qt_LE_queue queue to avoid any race-conditions (since they potentially update manager's internal state). 3. Results/errors are now reported using LECentralNotifier's object (QLowEnergyController has corresponding slots connected to the notifier) Task-number: QTBUG-49476 Change-Id: Ie07cdc13ad559c96a7d2ff010843fb7bcce07c99 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 16:37:05 +0000