Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"

2 files changed, 19 insertions, 1 deletions

diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 0000000..ebb4be1
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,18 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json b/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
index f21ee8b..84e5c1f 100644
--- a/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
+++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
@@ -6,7 +6,7 @@
             "nextConfiguration" : ["b"]
         },
         {
-            "after" : 100,
+            "after" : 300,
             "event" : { "name" : "t2" },
             "nextConfiguration" : ["e"]
         }