summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2020-01-301-3/+3
| | | | | Change-Id: I270e1a1e8599aaecdefc52d89b91c011cabb74ca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-211-2/+2
|\ | | | | | | Change-Id: I0d6054198c51622ce0e9c5816e9cc31a6678a62d
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-181-2/+2
| |\ | | | | | | | | | Change-Id: I4579c24569c9d30896026703df85cb3eeafa945d
| | * Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: I79bf1dc18c45dbdfe6e246e396adcf856dfee63f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-312-0/+10690
|\| | | | | | | | | | | Change-Id: I98b8cbf084167c9d07426a14116f1a03dfa896fe
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-302-0/+10690
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I951dbf0b3435602f0a59e47bf11471f0a3b0137e
| | * Add binary compatibility files for qtconnectivity 5.14 branchMilla Pohjanheimo2019-12-202-0/+10690
| | | | | | | | | | | | | | | | | | | | | | | | BC files built against 5.14.0 added. Change-Id: Ida4b77e83f39e69271133a11a5cdaa03ec844ad5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: I4a234be4292f92480add8fdcbecfaeba1946afad
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-172-1/+56
|\| | | | | | | | | | | Change-Id: I9d7eea08cf1ea946a28a90de5706f2f3d66de4fe
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-142-1/+56
| |\| | | | | | | | | | Change-Id: I2906aaa474060889fa2dfb6243932d280360f0a9
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+53
| | |\ | | | | | | | | | | | | Change-Id: I301fc10a56c4fd1aa8879064dc4c71accca4d8e0
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-231-0/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: If0ed88f30df8764649a4d5fc735fcda252eb46f4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | Android: Fix failing re-addvertisement of BTLE service after disconnectAlex Blasche2019-12-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BTLE server can disconnect by own choice and by remotely initiated disconnect. Often the app might want to readvertise the same service right after the disconnect. Such a readvertisement fails when the BluetoothGattServer instance is not recreated, before calling BluetoothGattServer.addService(). In the case of remote disconnects we never recreated the BluetoothGattServer instance therefore the readvertisement always failed. This patch fixes the issue by ensureing the previous instance is properly discarded. Change-Id: I39380ee6f1f39bd71a5b73ec82bb786b3e199665 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-106-22/+36
|\| | | | | | | | | | | | | | | Change-Id: I6a7635841698e6de98d94ac8b21a1764f01569e2
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-076-22/+36
| |\| | | | | | | | | | | | | | Change-Id: I4fb1628743f0e4fe6042e49efa27a7b6b8f68e5b
| | * | Fix warning in QBluetoothServer on LinuxAlex Blasche2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from qbluetoothserver_bluez.cpp:41:0: qbluetoothserver_p.h: In constructor ‘QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol, QBluetoothServer*)’: qbluetoothserver_p.h:128:29: warning: ‘QBluetoothServerPrivate::m_lastError’ will be initialized after [-Wreorder] QBluetoothServer::Error m_lastError; ^~~~~~~~~~~ qbluetoothserver_p.h:125:23: warning: ‘QBluetoothServer* QBluetoothServerPrivate::q_ptr’ [-Wreorder] QBluetoothServer *q_ptr; ^~~~~ qbluetoothserver_bluez.cpp:69:1: warning: when initialized here [-Wreorder] QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType, ^~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I4fca28f8f2974cb6a336b6fac1e06469edceb80c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | bluez-dbus: Invalidate btle service when it has disappearedChristian Wassmuth2019-12-051-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a previous existing service UUID has disapperad we will now invalidate that service and remove it from the service list [ChangeLog][QtBluetooth][BlueZ-DBus] Invalidate btle service when it has disappeared Fixes: QTBUG-77766 Change-Id: Id03a054c1f781dbcef5614623c2dae9b156d12e2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Fix a few compiler warnings in lowenergydescriptor unit testAlex Blasche2019-12-041-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic77df9c81ff0b56408d2636582f976f2140708e2 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | bluez: Fix out of sync property cacheThiemo van Engelen2019-12-043-18/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2c6dcc643, a map containing dbus property values is kept per device to be able to make QBluetoothDeviceInfo instances without having to make dbus calls. However, this map could get out of sync. The reason was that the code started to listen to PropertyChanged signals after it received the initial set of properties. This meant that there was a short amount of time where bluez could send out a signal with changed properties and the DiscoveryAgent would not receive it. In order to keep the map in sync, a PropertyChanged listener is now installed when scanning is started, picking up all changes. Change-Id: Iae5e219b187e94bf280a6dd76ccde49cafd1d9c5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | Change-Id: Icc5b7e20dab0c1df8912acd6792412b88a8226db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | Change-Id: Iea797ae225267e23a64d49fd5e9047b51f8cfc7f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-291-3/+3
| | | | | | | | | | | | | | | Change-Id: Ied6b1af8233d99d5f38c7c8c1b8bd911eef566f9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix failing tst_qlowenergydescriptorAndre de la Rocha2019-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qlowenergydescriptor::tst_assignCompare() could fail due to a dependency on a particular characteristic found in a BLE device used for development tests. It should work regardless of it. Fixes: QTBUG-79492 Change-Id: Ia0d640b547c1170523e7b9304c7de175da432886 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia31aee38745e12d65906081f3ecbfd3667596ba4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-271-3/+3
| | | | | | | | | | | | | | | Change-Id: I6dd067c7186ef5a19a3a25560e6b3048ed240579 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I875ab0848b2b92e7558f63791caeef0b7113ca93 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-234-7/+15
|\| | | | | | | | | | | Change-Id: I0ecec144ca0fc94d0d95c6a8a3a71aa58b8d40cd
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-164-7/+15
| |\| | | | | | | | | | Change-Id: I56cd17d682a7d3ad7c81ffc53c06adf9b2997958
| | * Doc: Fix documentation warningsTopi Reinio2019-11-114-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a \class command for QNearFieldTarget::RequestId whose members were already documented. Remove QDoc comment marker for QBluetoothDeviceInfo::serviceUuids() overload as its declaration in the header file is omitted by a QT_DEPRECATED_SINCE macro. Fix linking issues and missing parameter documentation. Fixes: QTBUG-79814 Change-Id: I9804fcbd559f1924a2a7b16fdbdfb23398605eaa Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia8802da4d2e60cfb2b9d862074939fa43a29fdbe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-161-0/+35
|\| | | | | | | | | | | Change-Id: I0cb89d366c420ab98e521632abbdcddd23428ae6
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+35
| |\| | | | | | | | | | Change-Id: I063af3d8cac7aae03eb24a562bb7f82e96e614bf
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib02a916e3258fde37aae969b73df77eb9cb7eda8
| | | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+36
| | | |\ | | | | | | | | | | | | | | | Change-Id: I636a838d6b38996e2133536cbe523c3bfebf6d96
| | | | * Add changes file for Qt 5.13.2v5.13.2Antti Kokko2019-10-221-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 406b18fdb3704a9e9e66cefbc74e7cff55f1947c Fix QLEAdvertisingData::setManufacturerData on Android + 0a5bf7a41e5c2c4a36efeace83444ceaee79c945 Add changes file for Qt 5.12.5 and fix 5.12.4 change file + dd4593c61e4b77c4e3b1ee516a1e8825ebb0197b Fix build errors with clang-cl on Windows + d3ace86011d4e34eeafa795270ac027afd54f857 Doc: Replace WinRT with UWP in Qt Bluetooth module docs + 7390de230e3c86049824bef756e4af623a547d61 Add descriptor even if the read fails during service discovery Change-Id: Ief5198d3c8c927226c59fdb2b8f44dac1f428b20 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I28a758b2323407cb86bd86ec3f70214a8220d779
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If674c0227d902192d26f217507c7ae6de34461a8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4bfbbd3cecda16282828acd405c31cad37ee017c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-0/+1
|\| | | | | | | | | | | | | | | | | | | Change-Id: I9e858c5b4413fc657addc4d731891c8180f072b9
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-0/+1
| |\| | | | | | | | | | | | | | | | | | Change-Id: Id9d1d013025262649c27e1b4d7cf43f2d7a9e11a
| | * | | Build fix: Add errno.h include header for errno usageCristian Adam2019-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Clang-Mingw the value for EADDRINUSE was not known, unless errno.h was included. Change-Id: I8a75a9c7b8f4578ab6c829d424d59a1c6185376b Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the recent refactoring the writing ability was severed. Change-Id: Ib9f116cdbbbfd87593381cb62675cab4930a2ef1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a545df78ed2c1bc8f12c7a2fc2be544ce096f18 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd1bdd3a898ca3609e533272cb451c13cf7c07d4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5210e3bab39263c71a1f7298a09b4f33b5ff2aa2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21a27d9729da9bcddf337777b4fa732388c9fa81 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-022-8/+4
|\| | | | | | | | | | | | | | | | | | | Change-Id: I4bb9257f062477cd7eece5692ace7afa5e64f9c6
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-262-8/+4
| |\| | | | | | | | | | | | | | | | | | Change-Id: I24fadee07534c20a35b9e4de5ba7eef787ef3bbe
| | * | | Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary changes to be compatible with AAB changes in Qt 5.14. Change-Id: Ie5957a7e936644f43bd320f28053466794efcaf1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-221-4/+2
| | |\| | | | | | | | | | | | | | | | | Change-Id: Ic9af5cb329f2fe15b74c76fc33c2beaaa5de4993
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 05:51:49 +0000