Change-Id: I8206a8051a9003a0fc4f303e8a9e384f9629f74f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
When we try to create a QNearFieldTarget for unittests we run into a crash: 1 QAtomicOps<QThreadData *>::loadRelaxed<QThreadData *> qatomic_cxx11.h 203 2 QBasicAtomicPointer<QThreadData>::loadRelaxed qbasicatomic.h 171 3 QObject::thread qobject.cpp 1594 4 QObject::QObject qobject.cpp 935 5 QNearFieldTargetPrivate::QNearFieldTargetPrivate qnearfieldtarget_p.cpp 15 6 QNearFieldTarget::QNearFieldTarget qnearfieldtarget.cpp 219 It is crashing because the used parent (this) is not fully initialized when QObject try to determine the thread. There is no need to define the parent in the constructor parameter because the parent is set in line 399 anyways. Pick-to: 6.11 6.8 Change-Id: Idb811b3d5df7e8adfce49116bc7378b161896669 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
The documentation was incomplete, because it fully ignored some of the existing backends. Extend the docs for both QBluetoothServer and QBluetoothSocket to provide relevant information. Fixes: QTBUG-146161 Pick-to: 6.11 6.8 Change-Id: Ia22fa28d46e71145902f983d0397358faaff0fba Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Add Gradle project structure for JAR builds which allows CMake to run a Gradle build and also enables such code to be managed from IDEs easily. The default Android platform Jar include won't be needed because it's handled by Gradle, and the main QtAndroid.jar include is added automatically by qt_internal_add_jar(). This also update gitignore with Gradle, JDTLS and IntelliJ ignores. It also removes files that might have been used exclusively for javac and some that are not needed for neither javac nor Gradle. Task-number: QTBUG-132915 Change-Id: I46452ba0f7e0213ea2758ebaa4e7474bffcc301c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Change-Id: I6679d85a2c508cf4a778769c8e215c4b5272652f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Pick-to: 6.11 Task-number: QTBUG-145851 Change-Id: I4c981bb1c44fa6b6b93aac9de6238eab3d935973 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
The class was hashable via implicit conversion to its public base class, QUUuid. But that involves the infamous 1-to-2-arg qHash() adapter template that we want to get rid of (deprecated/=delete), so provide a matching qHash() overload that calls the overload for the base class. Because this is a public class and the implicit qHash() overload was from a template, thus inline, we need to retain compatibility with the way the adapter calculated the hash (call qHash() with seed = 0 and then xor seed into the result. This is what QHashPrivate::ex1to2arg() does, falling back to the idiomatic way of passing the seed as the second argument of qHash() in Qt 7). Pick-to: 6.11 6.11.1 Task-number: QTBUG-145851 Change-Id: Ic07d32d3dfb262bb3eec0c600ade97785cc94955 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
BluetoothLEDevice::FromBluetoothAddressAsync and GetGattServicesAsync completion lambdas call chained WinRT accessors (DeviceInformation(), Pairing(), Services(), Uuid(), ...). Each accessor runs check_hresult() on the backing ABI call and throws winrt::hresult_error on failure. After the Bluetooth stack has torn down state (system suspend/resume, radio toggled, service restart), those calls routinely fail and the exception propagates out of the lambda, crashing the process with an access violation on the failing RaiseException. Wrap the vulnerable calls in handleLowEnergyDevice with the shared SAFE()/TRY() helpers from qbluetoothutils_winrt_p.h. SAFE(expr) returns expr's value on success and a default-constructed value on a caught hresult_error; TRY(stmt) runs stmt and returns true/false. Both log the HRESULT. The covered calls are device.BluetoothAddress() (TRY, so a successfully read address of 0 -- technically not a valid BD_ADDR per the spec but allowed by the existing code -- still proceeds, and only an actual hresult_error causes us to bail), device.Name() (SAFE; an empty hstring is fine for an unnamed device), device.DeviceInformation().Pairing() .IsPaired() (SAFE), device.GetGattServicesAsync() (SAFE), asyncOp.Completed() (TRY; registering the completion handler can also throw, in which case the handler isn't bound and we have to decrement the pending counter ourselves), and op.GetResults() inside the completion lambda (SAFE, so the existing null-check covers both the thrown and the S_OK-with-null cases with one branch). In handleGattServices, wrap the whole Status/Services/Uuid block in try/catch instead of SAFE-wrapping individual calls -- service.Uuid() returns a winrt::guid that isn't cleanly default-constructible inside SAFE, and the qScopeGuard at the top already ensures the pending counter is decremented on any exit path. Pick-to: 6.11 6.8 Fixes: QTBUG-145898 Change-Id: I9bd6d53773b473ee6d543e1a7e160d91ee08b4a1 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
The SAFE/HR/TRY/LOG_HRESULT macros that wrap C++/WinRT projection
accessors so a thrown winrt::hresult_error becomes a logged HRESULT
plus a default-constructed return value were defined locally in
qlowenergycontroller_winrt.cpp. The same pattern is needed in other
WinRT bluetooth backend files, so move the definitions into
qbluetoothutils_winrt_p.h, which the affected sources already include.
The unified SAFE() branches on std::is_default_constructible: types
that are default-constructible (primitives, enums, winrt::hstring,
generic interfaces like IAsyncOperation<T> whose nullptr_t constructor
has a default argument) get decltype(x){} on the failure path, while
runtimeclass projections that only declare an explicit
Class(std::nullptr_t) constructor fall back to decltype(x)(nullptr).
The old form decltype(x)(0) reached the second group via the null-
pointer-constant conversion to nullptr_t but failed for winrt::hstring
whose nullptr_t constructor is deleted; a naive decltype(x){} failed
for the runtimeclass projections.
Pick-to: 6.11 6.8
Task-number: QTBUG-145898
Change-Id: I0e2b59bacb551748bf27f7ac74e810f8fdbb005e
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Change-Id: I704843028d036cc352a1495925a3e5d7d76f0745 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>