From 094f7cab54db7f9ce3b62fc1041c33ab30c202f0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 7 Aug 2024 15:23:39 -0700 Subject: QDebug: improve support for printing 64-bit QFlags Like the 32-bit version, we add an explicitly-exported non-template overload. And we can call the 64-bit implementation from the 32-bit one to save in code generation inside QtCore. Task-number: QTBUG-111926 Change-Id: I8a96935cf6c742259c9dfffd17e9928218333c04 Reviewed-by: Ahmad Samir Reviewed-by: Fabian Kosmale --- src/corelib/io/qdebug.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/corelib/io/qdebug.cpp') diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index d5bdfadba92..598355e4296 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -1329,9 +1329,19 @@ QDebugStateSaver::~QDebugStateSaver() */ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, uint value) { - qt_QMetaEnum_flagDebugOperator(debug, sizeofT, value); + qt_QMetaEnum_flagDebugOperator(debug, sizeofT, quint64(value)); } +/*! + \internal + Ditto, for 64-bit. +*/ +void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, quint64 value) +{ + qt_QMetaEnum_flagDebugOperator(debug, sizeofT, value); +} + + #ifndef QT_NO_QOBJECT /*! \internal @@ -1449,7 +1459,7 @@ QDebug qt_QMetaEnum_flagDebugOperator(QDebug &debug, quint64 value, const QMetaO debug << '('; } - debug << me.valueToKeys(static_cast(value)); + debug << me.valueToKeys(value); if (enumScope) debug << ')'; -- cgit v1.2.3