From 4ccd974ada60b2df5fce84ee528de1132522a38b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 11 Feb 2022 18:28:29 -0800 Subject: [PATCH] QDebug: unexport most of the class for Qt 7 Only a few helper methods need to be exported. Change-Id: I74249c52dc02478ba93cfffd16d2e8eac8a13182 Reviewed-by: Kai Koehne Reviewed-by: Marc Mutz --- src/corelib/io/qdebug.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 2647f3da0f5..fccf581ed92 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -60,8 +60,7 @@ QT_BEGIN_NAMESPACE - -class Q_CORE_EXPORT QDebug : public QIODeviceBase +class QT6_ONLY(Q_CORE_EXPORT) QDebug : public QIODeviceBase { friend class QMessageLogger; friend class QDebugStateSaver; @@ -93,9 +92,9 @@ class Q_CORE_EXPORT QDebug : public QIODeviceBase enum Latin1Content { ContainsBinary = 0, ContainsLatin1 }; - void putUcs4(uint ucs4); - void putString(const QChar *begin, size_t length); - void putByteArray(const char *begin, size_t length, Latin1Content content); + QT7_ONLY(Q_CORE_EXPORT) void putUcs4(uint ucs4); + QT7_ONLY(Q_CORE_EXPORT) void putString(const QChar *begin, size_t length); + QT7_ONLY(Q_CORE_EXPORT) void putByteArray(const char *begin, size_t length, Latin1Content content); public: explicit QDebug(QIODevice *device) : stream(new Stream(device)) {} explicit QDebug(QString *string) : stream(new Stream(string)) {} @@ -107,7 +106,7 @@ public: ~QDebug(); void swap(QDebug &other) noexcept { qt_ptr_swap(stream, other.stream); } - QDebug &resetFormat(); + QT7_ONLY(Q_CORE_EXPORT) QDebug &resetFormat(); inline QDebug &space() { stream->space = true; stream->ts << ' '; return *this; } inline QDebug &nospace() { stream->space = false; return *this; }