diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-09 11:15:59 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-08-18 14:00:49 +0000 |
commit | 0933e6d71310178667cce1a60ac65c23a956eb34 (patch) | |
tree | 4fd7bb83bbe7ddd499c266387e13a169d57e16ba /tests | |
parent | 52057e503c6bde4c5c196572a1ec55bdd93d61e6 (diff) |
In Qt mode reject documents with events that cannot be mapped to slots
This severely limits the use of Qt mode, as hierarchical events like
done.state.foo cannot appear in the document anymore. However, it makes
the rules about what is and what is not legal in Qt mode more
consistent.
Task-number: QTBUG-53435
Change-Id: I08b90f34c651a57d86607eea2a38f5bd1f73b8b3
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/compiled/eventnames2.scxml | 2 | ||||
-rw-r--r-- | tests/auto/parser/data/qtmode.scxml.errors | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/compiled/eventnames2.scxml b/tests/auto/compiled/eventnames2.scxml index 32c80d5..ee5448f 100644 --- a/tests/auto/compiled/eventnames2.scxml +++ b/tests/auto/compiled/eventnames2.scxml @@ -28,7 +28,7 @@ ** ****************************************************************************/ --> -<!-- enable-qt-mode: yes --> +<!-- enable-qt-mode: no --> <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" name="eventnames2"> <state id="a"> <onentry> diff --git a/tests/auto/parser/data/qtmode.scxml.errors b/tests/auto/parser/data/qtmode.scxml.errors index fd3671f..ae365b9 100644 --- a/tests/auto/parser/data/qtmode.scxml.errors +++ b/tests/auto/parser/data/qtmode.scxml.errors @@ -2,6 +2,8 @@ :/tst_parser/data/qtmode.scxml:36:34: error: event name 'void' is not a valid C++ identifier in Qt mode :/tst_parser/data/qtmode.scxml:37:38: error: event name 'aChanged' collides with a state name 'a' in Qt mode :/tst_parser/data/qtmode.scxml:38:38: error: event name 'finished' is not a valid Qt identifier in Qt mode +:/tst_parser/data/qtmode.scxml:39:42: error: event name 'done.state.a' is not a valid C++ identifier in Qt mode +:/tst_parser/data/qtmode.scxml:40:47: error: event name 'done.state.double' is not a valid C++ identifier in Qt mode :/tst_parser/data/qtmode.scxml:42:21: error: state name 'int' is not a valid C++ identifier in Qt mode :/tst_parser/data/qtmode.scxml:43:28: error: state name 'objectName' is not a valid Qt identifier in Qt mode :/tst_parser/data/qtmode.scxml:45:28: error: state name 'fooChanged' collides with a state name 'foo' in Qt mode |