diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-06 15:28:11 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-07 12:54:07 +0000 |
| commit | 50f27e0ea97d97c396b58aceb045edfcc62eee45 (patch) | |
| tree | ae6977f636d822734dcd1da2cf7e226fa67f77fa /src | |
| parent | b00312476eb182c5cd716559148016558a5889b4 (diff) | |
Evaluate expr in <content> to variant, rather than string
There is no reason to artificially clamp the range of possible data
types as the data() member of QScxmlEvent is QVariant.
Change-Id: I9264a61566c60bbf1325f3864064a093dc02edbd
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmlevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scxml/qscxmlevent.cpp b/src/scxml/qscxmlevent.cpp index 6da52d7..907474a 100644 --- a/src/scxml/qscxmlevent.cpp +++ b/src/scxml/qscxmlevent.cpp @@ -67,7 +67,7 @@ QScxmlEvent *QScxmlEventBuilder::buildEvent() if (contentExpr == NoEvaluator) { data = contents; } else { - data = dataModel->evaluateToString(contentExpr, &ok); + data = dataModel->evaluateToVariant(contentExpr, &ok); } if (!ok) { // expr evaluation failure results in the data property of the event being set to null. See e.g. test528. |