From 10a2704788f0bdf8dad3f7872db11f76ca2f4a18 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 2 Nov 2017 13:24:06 +0200 Subject: Add changes file for Qt 5.9.3 Change-Id: Ie68f0db2f82cc6a258dc20f43f3662490dd175dc Reviewed-by: Lars Knoll --- dist/changes-5.9.3 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.3 diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3 new file mode 100644 index 0000000..bb5db63 --- /dev/null +++ b/dist/changes-5.9.3 @@ -0,0 +1,24 @@ +Qt 5.9.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.3 Changes * +**************************************************************************** + + - This release contains only minor code improvements. -- cgit v1.2.1 From 4e8ffdec8fe2ba586820b24ac5077d58040eb6c1 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Wed, 8 Nov 2017 12:16:22 +0200 Subject: Add changes file for Qt 5.10.0 Change-Id: I3362bd81d9f48b436c3b9c83b54190380b985513 Reviewed-by: Milian Wolff --- dist/changes-5.10.0 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 dist/changes-5.10.0 diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0 new file mode 100644 index 0000000..e7365f5 --- /dev/null +++ b/dist/changes-5.10.0 @@ -0,0 +1,22 @@ +Qt 5.10 introduces many new features and improvements as well as bugfixes +over the 5.9.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.10 series is binary compatible with the 5.9.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +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. + +**************************************************************************** +* Qt 5.10.0 Changes * +**************************************************************************** + + - This release contains only minor code improvements. -- cgit v1.2.1 From d05fc61c3953aee73bf3a912f30706ca092732f7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Dec 2017 12:06:51 +0100 Subject: Bump version Change-Id: Id968066c681217f4f441befaecba63e3bf16128f --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 4e4a28b..f2b6bef 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.10.0 +MODULE_VERSION = 5.10.1 -- cgit v1.2.1 From d2f9396f048ef8fdd494626d92b3d7106fb10304 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 28 Dec 2017 13:43:03 +0200 Subject: Fix TestWebChannel::testAsyncObject If signal is emitted directly, QSignalSpy::wait() is called too late. In that case the correct information about emitted signal can be checked with QSignalSpy::count(). Task-number: QTBUG-63152 Change-Id: I0c3da52ab17f9138ad1a7a17f5065b8a87911b8f Reviewed-by: Lars Knoll --- tests/auto/webchannel/tst_webchannel.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index f214b7e..4309647 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -770,6 +770,11 @@ void TestWebChannel::testInfiniteRecursion() void TestWebChannel::testAsyncObject() { + auto waitForSignal = [] (QSignalSpy& spy) { + for (int i=0; (i<5) && (spy.count() == 0); i++) + spy.wait(1000); + }; + QWebChannel channel; channel.connectTo(m_dummyTransport); @@ -788,7 +793,8 @@ void TestWebChannel::testAsyncObject() { QSignalSpy spy(&obj, &TestObject::propChanged); channel.d_func()->publisher->invokeMethod(&obj, method, args); - QVERIFY(spy.wait()); + waitForSignal(spy); + QCOMPARE(spy.count(), 1); QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString()); } @@ -804,10 +810,13 @@ void TestWebChannel::testAsyncObject() { QSignalSpy spy(&obj, &TestObject::replay); QMetaObject::invokeMethod(&obj, "fire"); - QVERIFY(spy.wait()); + waitForSignal(spy); + QCOMPARE(spy.count(), 1); channel.deregisterObject(&obj); QMetaObject::invokeMethod(&obj, "fire"); - QVERIFY(spy.wait()); + spy.takeFirst(); + waitForSignal(spy); + QCOMPARE(spy.count(), 1); } thread.quit(); -- cgit v1.2.1 From 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 29 Dec 2017 09:51:58 +0200 Subject: Clean up TestWebChannel::testAsyncObject Task-number: QTBUG-63152 Change-Id: I22df2328f0ab6d2a2d12458dbeaec68bfbe36985 Reviewed-by: Lars Knoll --- tests/auto/webchannel/tst_webchannel.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index 4309647..a44220f 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -770,11 +770,6 @@ void TestWebChannel::testInfiniteRecursion() void TestWebChannel::testAsyncObject() { - auto waitForSignal = [] (QSignalSpy& spy) { - for (int i=0; (i<5) && (spy.count() == 0); i++) - spy.wait(1000); - }; - QWebChannel channel; channel.connectTo(m_dummyTransport); @@ -793,8 +788,7 @@ void TestWebChannel::testAsyncObject() { QSignalSpy spy(&obj, &TestObject::propChanged); channel.d_func()->publisher->invokeMethod(&obj, method, args); - waitForSignal(spy); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(spy.count(), 1); QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString()); } @@ -810,13 +804,10 @@ void TestWebChannel::testAsyncObject() { QSignalSpy spy(&obj, &TestObject::replay); QMetaObject::invokeMethod(&obj, "fire"); - waitForSignal(spy); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(spy.count(), 1); channel.deregisterObject(&obj); QMetaObject::invokeMethod(&obj, "fire"); - spy.takeFirst(); - waitForSignal(spy); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(spy.count(), 2); } thread.quit(); -- cgit v1.2.1