diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-08-10 17:42:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-11 09:55:32 +0000 |
| commit | 716d348cd57cd94034e4b10815e65bc2e2f82d1c (patch) | |
| tree | 144ca60fb37638894475c5f7a1d81975a2947fb0 | |
| parent | 9f891cd571c246f853a961b0b4e40fe1dcb8c89d (diff) | |
QBluetoothUuid: add missing Endian argument to Id128Bytes ctor
The base class has it, so QBluetoothUuid also has to have it, too, for
API symmetry.
Adapt the docs to be more like QUuid's for the same function, even
though those may still be improved in qtbase (in which case we
shouldn't forget to re-sync them here).
Found in API-review.
Change-Id: If13df1e7551235e2c9f57ba0e8729d7f2a6d494c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit a2944859ac2a6a13100b5a06c681fb477231e52a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.cpp | 5 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index 5338c978..8f54833b 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -525,10 +525,11 @@ Q_CONSTRUCTOR_FUNCTION(registerQBluetoothUuid) */ /*! - \fn QBluetoothUuid::QBluetoothUuid(QUuid::Id128Bytes uuid) + \fn QBluetoothUuid::QBluetoothUuid(QUuid::Id128Bytes uuid, QSysInfo::Endian order) + \since 6.6 Constructs a new Bluetooth UUID from the 128 bit \a uuid represented - by \l QUuid::Id128Bytes struct. + by the integral \a uuid parameter and respecting the byte order \a order. */ /*! diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index d599c573..30641d35 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -352,8 +352,8 @@ public: : QUuid(uuid, 0x0, 0x1000, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb) {}; explicit QBluetoothUuid(quint128 uuid); - explicit QBluetoothUuid(QUuid::Id128Bytes uuid) noexcept - : QUuid(uuid) {}; + explicit QBluetoothUuid(Id128Bytes uuid, QSysInfo::Endian order = QSysInfo::BigEndian) noexcept + : QUuid(uuid, order) {}; explicit QBluetoothUuid(const QString &uuid); QBluetoothUuid(const QBluetoothUuid &uuid) = default; QBluetoothUuid(const QUuid &uuid); |