diff options
author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-04-27 10:19:37 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-04-28 12:30:20 +0000 |
commit | 1838e854828eb01512d4776cdc54887b7cf9c33b (patch) | |
tree | 01edf19bf3a1fa7bd94f1a76ffdf59c2dade6df3 /src | |
parent | 7e885ef3952830b9683d145aadc592c66cec180d (diff) |
Fix the event's debugString().
Change-Id: I08a066bcb5ba0b52fe9960294826d5ac2a580b63
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/scxml/qscxmlevent.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/scxml/qscxmlevent.cpp b/src/scxml/qscxmlevent.cpp index 3129063..bf5de7a 100644 --- a/src/scxml/qscxmlevent.cpp +++ b/src/scxml/qscxmlevent.cpp @@ -574,13 +574,20 @@ QByteArray QScxmlEventPrivate::debugString(QScxmlEvent *event) } QJsonObject o; - o[QStringLiteral("name")] = event->name(); - o[QStringLiteral("name")] = event->scxmlType(); - o[QStringLiteral("name")] = event->sendId(); - o[QStringLiteral("name")] = event->origin(); - o[QStringLiteral("name")] = event->originType(); - o[QStringLiteral("name")] = event->invokeId(); - o[QStringLiteral("data")] = QJsonValue::fromVariant(event->data()); + if (!event->name().isNull()) + o[QStringLiteral("name")] = event->name(); + if (!event->scxmlType().isNull()) + o[QStringLiteral("type")] = event->scxmlType(); + if (!event->sendId().isNull()) + o[QStringLiteral("sendid")] = event->sendId(); + if (!event->origin().isNull()) + o[QStringLiteral("origin")] = event->origin(); + if (!event->originType().isNull()) + o[QStringLiteral("origintype")] = event->originType(); + if (!event->invokeId().isNull()) + o[QStringLiteral("invokeid")] = event->invokeId(); + if (!event->data().isNull()) + o[QStringLiteral("data")] = QJsonValue::fromVariant(event->data()); return QJsonDocument(o).toJson(QJsonDocument::Compact); } |