diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:43:13 +0100 |
| commit | ac1bc572a22ed3de61076e2b8f27dea52171ddc8 (patch) | |
| tree | 8bca4d937c192117565b6e04c16e6aaab745c57e /tests | |
| parent | c5c6aba3b07a44726da96cd2acaed05e67fe3ff8 (diff) | |
| parent | 4f94bae73ccabfc714d248c6371f1883aacc1aa8 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/scxml/qscxmlcompiler.cpp
Change-Id: I4abda984e523cdf2a0810ed7dc1773e055746e18
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/parser/tst_parser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp index 13eed5a..22b9059 100644 --- a/tests/auto/parser/tst_parser.cpp +++ b/tests/auto/parser/tst_parser.cpp @@ -67,6 +67,9 @@ void tst_Parser::error() const QStringList expectedErrors = QString::fromUtf8(errorFile.readAll()).split('\n', QString::SkipEmptyParts); + if (!expectedErrors.isEmpty()) + QTest::ignoreMessage(QtWarningMsg, "SCXML document has errors"); + QScopedPointer<QScxmlStateMachine> stateMachine(QScxmlStateMachine::fromFile(scxmlFileName)); QVERIFY(!stateMachine.isNull()); |