AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't convert built-in types to strings for qDebug.

Browse Source 
This was introduced by 7ed15da3 (Core: QDebug and comparison operator
support metatypes,, 2013-03-20).

Change-Id: Id89aaffeee8d519ca73f0b52b1ac8b9d233cb5f1
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2013-06-07 12:00:53 +02:00 committed by The Qt Project
parent 8fbf959bee
commit aff03cbc27
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qvariant.cpp
View File

@ -3163,9 +3163,11 @@ QDebug operator<<(QDebug dbg, const QVariant &v)
if (typeId != QMetaType::UnknownType) { if (typeId != QMetaType::UnknownType) {
dbg.nospace() << QMetaType::typeName(typeId) << ", "; dbg.nospace() << QMetaType::typeName(typeId) << ", ";
bool userStream = false; bool userStream = false;
if (typeId >= QMetaType::User) bool canConvertToString = false;
if (typeId >= QMetaType::User) {
userStream = QMetaType::debugStream(dbg, constData(v.d), typeId); userStream = QMetaType::debugStream(dbg, constData(v.d), typeId);
bool canConvertToString = v.canConvert<QString>(); canConvertToString = v.canConvert<QString>();
}
if (!userStream && canConvertToString) if (!userStream && canConvertToString)
dbg << v.toString(); dbg << v.toString();
else if (!userStream) else if (!userStream)