diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2026-03-12 17:07:05 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2026-03-13 17:58:36 +0100 |
| commit | 2e7dad267054040f23db2b7a9724489d88398d1a (patch) | |
| tree | 913f0d4aa32b74e78a019296bc96d371c3296e5b | |
| parent | 8dbf76b247cabbd098f368c33baf07115b5b5a2e (diff) | |
The \fn in the qdoc block had the wrong return type (lvref on a
const-this function), but qdoc fixed that in the generated docs.
It's unclear, though, from the docs, that the operator is
move-enabled, so let qdoc see the real overload set, and document them
all.
Amends b19220d17fa66de5ded41690ffff263ee2af5c63 (5.15).
Pick-to: 6.11 6.10 6.8
Change-Id: Ia88f3da5e9a634b9a7af22435f384e367c3da562
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/text/qbytearray.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/text/qbytearray.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index ee12f3f8f33..c33c314d556 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -5175,7 +5175,9 @@ emscripten::val QByteArray::toEcmaUint8Array() */ /*! - \fn QByteArray &QByteArray::FromBase64Result::operator*() const + \fn const QByteArray &QByteArray::FromBase64Result::operator*() const & + \fn QByteArray &QByteArray::FromBase64Result::operator*() & + \fn QByteArray &&QByteArray::FromBase64Result::operator*() && Returns the decoded byte array. */ diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index 7dd85437472..a690382b8f2 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -795,14 +795,9 @@ public: explicit operator bool() const noexcept { return decodingStatus == QByteArray::Base64DecodingStatus::Ok; } -#if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(Q_QDOC) QByteArray &operator*() & noexcept { return decoded; } const QByteArray &operator*() const & noexcept { return decoded; } QByteArray &&operator*() && noexcept { return std::move(decoded); } -#else - QByteArray &operator*() noexcept { return decoded; } - const QByteArray &operator*() const noexcept { return decoded; } -#endif friend inline bool operator==(const QByteArray::FromBase64Result &lhs, const QByteArray::FromBase64Result &rhs) noexcept { |