diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 600b8b13b80..1c6aecaaabb 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -1000,6 +1000,8 @@ QDebug &QDebug::resetFormat() \since 6.0 \include qdebug-toString.qdocinc + + \sa toBytes() */ /*! \internal */ @@ -1013,6 +1015,26 @@ QString QDebug::toStringImpl(StreamTypeErased s, const void *obj) return result; } +/*! + \fn template QByteArray QDebug::toBytes(const T &object) + \since 6.9 + + This is equivalent to \c{QDebug::toString(object).toUtf8()}, but more efficient. + + \sa toString() +*/ + +/*! \internal */ +QByteArray QDebug::toBytesImpl(StreamTypeErased s, const void *obj) +{ + QByteArray result; + { + QDebug d(&result); + s(d.nospace(), obj); + } + return result; +} + /*! \fn template QDebug operator<<(QDebug debug, const QList &list) \relates QDebug diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index fe3c66180c3..ab1f53afe77 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -51,6 +51,9 @@ class QT6_ONLY(Q_CORE_EXPORT) QDebug : public QIODeviceBase explicit Stream(QString *string) : ts(string, WriteOnly) {} + explicit Stream(QByteArray *ba) + : ts(ba, WriteOnly) + {} explicit Stream(QtMsgType t) : ts(&buffer, WriteOnly), type(t), @@ -78,6 +81,7 @@ class QT6_ONLY(Q_CORE_EXPORT) QDebug : public QIODeviceBase public: explicit QDebug(QIODevice *device) : stream(new Stream(device)) {} explicit QDebug(QString *string) : stream(new Stream(string)) {} + explicit QDebug(QByteArray *bytes) : stream(new Stream(bytes)) {} explicit QDebug(QtMsgType t) : stream(new Stream(t)) {} QDebug(const QDebug &o) : stream(o.stream) { ++stream->ref; } QDebug(QDebug &&other) noexcept : stream{std::exchange(other.stream, nullptr)} {} @@ -232,12 +236,19 @@ private: } using StreamTypeErased = void(*)(QDebug&, const void*); QT7_ONLY(Q_CORE_EXPORT) static QString toStringImpl(StreamTypeErased s, const void *obj); + QT7_ONLY(Q_CORE_EXPORT) static QByteArray toBytesImpl(StreamTypeErased s, const void *obj); public: template static QString toString(const T &object) { return toStringImpl(&streamTypeErased, &object); } + + template + static QByteArray toBytes(const T &object) + { + return toBytesImpl(&streamTypeErased, &object); + } }; Q_DECLARE_SHARED(QDebug) diff --git a/src/testlib/qtesttostring.h b/src/testlib/qtesttostring.h index 903392697d6..bcd70501f67 100644 --- a/src/testlib/qtesttostring.h +++ b/src/testlib/qtesttostring.h @@ -55,7 +55,7 @@ inline typename std::enable_if::Value && !std::is_e char *result = nullptr; #ifndef QT_NO_DEBUG_STREAM if constexpr (QTypeTraits::has_ostream_operator_v) { - result = qstrdup(QDebug::toString(t).toUtf8().constData()); + result = qstrdup(QDebug::toBytes(t).constData()); } else { static_assert(!QMetaTypeId2::IsBuiltIn, "Built-in type must implement debug streaming operator "