From 1c623bc6d1c0a7ca52d81ca72c64f36898b3e12c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 26 Jul 2018 13:55:19 +0200 Subject: Fix QMetaObject naming of class enum flag Adds an enumName to QMetaEnum to carry the name of the enum since for flags that doesn't match the name of the Qt type, but is needed if the flag is scoped. Change-Id: I1c0f77eb9e40e6fd1eb6a59bea77caf0f33fcf43 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/io/qdebug.cpp | 4 ++-- 1 file changed, 2 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 12f590584c..2e825d2373 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -946,7 +946,7 @@ QDebug qt_QMetaEnum_debugOperator(QDebug &dbg, int value, const QMetaObject *met if (const char *scope = me.scope()) dbg << scope << "::"; if (me.isScoped()) - dbg << name << "::"; + dbg << me.enumName() << "::"; dbg << key; } else { dbg << meta->className() << "::" << name << "(" << value << ")"; @@ -964,7 +964,7 @@ QDebug qt_QMetaEnum_flagDebugOperator(QDebug &debug, quint64 value, const QMetaO const QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name)); if (const char *scope = me.scope()) debug << scope << "::"; - debug << me.name() << ">(" << me.valueToKeys(value) << ')'; + debug << me.enumName() << ">(" << me.valueToKeys(value) << ')'; return debug; } #endif // !QT_NO_QOBJECT -- cgit v1.2.3