Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I4af9cf36594aeed95740bd49b749e041a28cdcec

2 files changed, 33 insertions, 0 deletions

diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0
new file mode 100644
index 0000000..cfc438d
--- /dev/null
+++ b/dist/changes-5.14.0
@@ -0,0 +1,31 @@
+Qt 5.14 introduces many new features and improvements as well as bugfixes
+over the 5.13.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.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+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.
+
+****************************************************************************
+*                               QWebChannel                                *
+****************************************************************************
+
+ - General:
+   * It is now possible to explicitly call overloaded methods or connect to
+     overloaded signals by specifying the full method or signal signature
+     in string form on the JavaScript side.
+   * Send current property values when another transport is accessing a
+     previously wrapped object.
+   * Various improvements in the handling of nested wrapped objects.
+   * Async calls to C++ methods from the JavaScript side will now return
+     a Promise if no callback is given and the JavaScript runtime supports
+     promises.
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 4a66bdd..c47cd6b 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -915,6 +915,8 @@ void TestWebChannel::testInfiniteRecursion()
 
 void TestWebChannel::testAsyncObject()
 {
+    QSKIP("This test is broken. See QTBUG-80729");
+
     QWebChannel channel;
     channel.connectTo(m_dummyTransport);