diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-06-07 12:00:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-07 13:31:14 +0200 |
| commit | aff03cbc276357b4db412ec8f8368e723f2a6277 (patch) | |
| tree | 40b2fbe9e2e9c7d1e87f01aa9f7cec1126d6ffd9 /src | |
| parent | 8fbf959bee9e1f5732df07678bf259e8cd08ee62 (diff) | |
Don't convert built-in types to strings for qDebug.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 274a86591b..a9e7549685 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3163,9 +3163,11 @@ QDebug operator<<(QDebug dbg, const QVariant &v) if (typeId != QMetaType::UnknownType) { dbg.nospace() << QMetaType::typeName(typeId) << ", "; bool userStream = false; - if (typeId >= QMetaType::User) + bool canConvertToString = false; + if (typeId >= QMetaType::User) { userStream = QMetaType::debugStream(dbg, constData(v.d), typeId); - bool canConvertToString = v.canConvert<QString>(); + canConvertToString = v.canConvert<QString>(); + } if (!userStream && canConvertToString) dbg << v.toString(); else if (!userStream) |