summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I947e4657fb07b0ada7007b69e265c56de1f0185d
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I6761dfc3892c530212681243b41779d412435ca5
* | QBluetoothDeviceDiscoveryAgent/Windows: Fix deprecation warningsFriedemann Kleint2020-01-291-5/+8
| | | | | | | | | | | | | | | | | | | | Change the code merging the Uuid sets to use QVector, fixing: qbluetoothdevicediscoveryagent_win.cpp:546:58: warning: 'QSet<T> QList<T>::toSet() const [with T = QBluetoothUuid]' is deprecated: Use qbluetoothdevicediscoveryagent_win.cpp:548:54: warning: 'QList<T> QSet<T>::toList() const [with T = QBluetoothUuid]' is deprecated: Use values() instead. [-Wdeprecated-declarations] Change-Id: I0e0780ef0b120318fe356cd58113a746adeff8a5 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QLowEnergyController/Windows: Fix warning about ignored qualifiersFriedemann Kleint2020-01-291-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace const PBLUETOOTH_GATT_VALUE_CHANGED_EVENT by const BLUETOOTH_GATT_VALUE_CHANGED_EVENT *, fixing: qlowenergycontroller_win.cpp: In function 'void eventChangedCallbackEntry(BTH_LE_GATT_EVENT_TYPE, PVOID, PVOID)': qlowenergycontroller_win.cpp:521:94: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers] reinterpret_cast<const PBLUETOOTH_GATT_VALUE_CHANGED_EVENT>(eventOutParameter)); Fix the spelling error in the class name on this occasion. Change-Id: Idff4eba4ba8cac74002be9fa54594f96393fa3fa Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QNearFieldTarget: Fix deprecation warningFriedemann Kleint2020-01-291-1/+1
| | | | | | | | | | | | | | | | Use QBasicAtomicInteger::loadRelaxed(), fixing: nearfieldtarget.cpp:229:28: warning: 'T QBasicAtomicInteger<T>::load() const [with T = int]' is deprecated: Use loadRelaxed [-Wdeprecated-declarations] Change-Id: Id46694c459d6e0ce923ceccf48067347067e1756 Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | QBluetoothDeviceInfo: Use a QMultiHash internallyFriedemann Kleint2020-01-293-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 5, this fixes the warning qbluetoothdeviceinfo.cpp:705:57: warning: 'QHash<K, V>::iterator QHash<K, V>::insertMulti(const Key&, const T&) [with Key = short unsigned int; T = QByteArray]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Returning a QHash still works in Qt 5 due to the inheritance. In Qt 6, the return type needs to be adapted since QMultiHash and QHash will be split. Change-Id: I876fce5d61cacdc84db5b9f72b78ee7608385c6c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-287-11/+41
|\| | | | | | | Change-Id: I8b1897b0c5254604c5720c7dd08362493a7ca4bc
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-277-11/+41
| |\ | | | | | | | | | Change-Id: I0c9cb5225aea489c789a4e40abd164bebff0c73d
| | * Fix up broken PropertiesChanged connectionsv5.14.1Alex Blasche2020-01-146-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change b7b979d1735764930cc6f736cfa8e22b71547ea8 introduced a slightly modified version of the OrgFreedesktopDBusPropertiesInterface::PropertiesChanged signal. This signal was taken into use in one case but all other instances of this signal were not modified and broken. This patch modifies the remaining cases and converts the connect statements to function pointer syntax. This forces the compiler to check that signal and slot parameters match. Change-Id: I41b45f7e2f7b66ff29f321acc38ff2ce1c81864e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Thiemo van Engelen <tvanengelen@victronenergy.com>
| | * Add changes file for Qt 5.14.1Antti Kokko2020-01-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b7b979d1735764930cc6f736cfa8e22b71547ea8 bluez: Fix out of sync property cache + 85bbb2e2e0e87e1b935a62da0eee44004952c542 Fix a few compiler warnings in lowenergydescriptor unit test + 27c0ae9ff94d545fb43446179e95276112b9f2cc bluez-dbus: Invalidate btle service when it has disappeared + f7075bc4536c9f72663378b94df55e6beb5a86fb Fix warning in QBluetoothServer on Linux + 0313535fd9ccb05b60c5e421c1c986e48564e254 Android: Fix failing re-addvertisement of BTLE service after disconnect + b74345a74c9b009398fefaef5642570716c9c3ed Bump version + 8159beeeb3290dc1c1b44b5a9792e19f272ad785 Add binary compatibility files for qtconnectivity 5.14 branch Change-Id: I9e23fef36b1d9125a4e27c7c3cf43680a2f277da Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | 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.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.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.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>
* | 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>
* | 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
* | | | 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>
* | | | 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
| | * | Fix classic device discovery on AndroidAlex Blasche2019-10-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems recent Android releases (at least confirmed for Android 9) require location permission for classic device discovery. Previously, it was only required for BTLE discovery. This patch ensures the permission check is done for every type of device discovery on Android. Task-number: QTBUG-69615 Change-Id: I9596c083ecfd9b5e861c1aa5e9900bab5f44237f Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After the recent refactoring the writing ability was severed. Change-Id: Ib9f116cdbbbfd87593381cb62675cab4930a2ef1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | examples/nfc/poster: Remove empty "icons" prefixOliver Wolff2019-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The prefix does not contain any files and was never used. Change-Id: I0c265a30c5ccc168a2fe55fb03861bc5eee9733a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-153-11/+25
|\| | | | | | | | | | | | | | | Change-Id: I044611763bf3912c99b2568de5146f112c4ac2ad
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Liang Qi2019-10-143-11/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/doc/src/bluetooth-index.qdoc Change-Id: If353b4ac63c72d6f94415e1349a206ade4ceb52e
| | * | qbluetoothdevicediscoveryagent_winrt: Decrement device count in case of failureOliver Wolff2019-10-111-4/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that obtaining a paired device inside the callback fails, if the device was paired to another than the currently active bluetooth adapter. If we do not decrement the to be detected device count, the scan will never finish. Change-Id: I86140d082891482c759f33888b2483f3f5821253 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Add descriptor even if the read fails during service discoveryAlex Blasche2019-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leDescriptorRead() serves two pruposes. Firstly, it informs Qt of the value/result of the read operation. During service discovery it is also used to inform Qt that a descriptor was found. This info is used to build up the internal data structure representing the service, its characteristics and its descriptors. If we have a non-readable descriptor the read failed (as expected) and Qt was never informed about the existence of the descriptor. During service discovery the primary purpose is to inform about the existence of a descriptor though. This patch ensures the notification comes through and we accept the fact that the passed value is not known. Fixes: QTBUG-78201 Change-Id: Id73a27c90905cb769f1cd168b48299d580587594 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Doc: Replace WinRT with UWP in Qt Bluetooth module docsLeena Miettinen2019-09-231-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-61884 Change-Id: Idd8e3287f06f3f30102ae8e644dadec1eb8769f4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | imports/nfc.pro: Remove QDeclarativeNearFieldSocketOliver Wolff2019-10-113-505/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The class has never been supported properly and has been commented out in the .pro file since forever. Change-Id: I0dabb747a6f2c1c8a476980c4835e5701a3c7830 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Remove usage of PRIVATE_ and PUBLIC_HEADERSOliver Wolff2019-10-114-30/+22
| | | | | | | | | | | | | | | | | | | | | pro2cmake does not like them Change-Id: I2fafdfff587fe76076417a53a082e467274db728 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Rename qlowenergycontroller_p... to qlowenergycontroller_dummyOliver Wolff2019-10-114-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | These files are no private headers/implementations but dummy versions of qlowenergycontroller. Change-Id: I2553ff933f45585edd690d807bf3c85a1906d1ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-012-2/+276
|\| | | | | | | | | | | Change-Id: If3339c7b17edf7897762ec343162a383c4c9eea4
| * | Update plugins.qmltypes for 5.14v5.14.0-beta1Kai Koehne2019-09-302-2/+276
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I9bfa89f0df938cadc9fb74bb96f24e1c4debb61a Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:36:58 +0000