From e2a5bf08c4d9239ff1da88b4d35e9bb89133a940 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:55:00 +0100 Subject: Bump version Change-Id: Ib1403a428870bf7852aa190d965aa6e33163ca0a --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2108ac6f..4f571fb5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.3 From e94bbed18aaa4461af68727fb9a41076b4669676 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 4 Jan 2018 13:40:16 +0200 Subject: Add changes file for Qt 5.9.4 Change-Id: I98faeda1640fdb2a659887700722f8e8ad464f89 Reviewed-by: Lars Knoll --- dist/changes-5.9.4 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.9.4 diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 00000000..10149376 --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,25 @@ +Qt 5.9.4 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.4 Changes * +**************************************************************************** + + - This release does not contain any changes to this module. + -- cgit v1.2.3 From 8f89e12e90d3f13f243c8dc51442f50e91446371 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Thu, 12 Oct 2017 17:35:16 +0300 Subject: testSingleGestures: Fix for case of multiple gestures This test fails sometimes for the twist gesture data, because it contains 3 gestures. QTRY_COMPARE_WITH_TIMEOUT usually stops comparison after recognition of the first gesture, but it may make the first comparison after more than one gesture has been recognized and thus fail the test. Add a new column to the test data with a list of gestures that should be recognized and use the list in QTRY_COMPARE_WITH_TIMEOUT. It will make the error message more informative if the test will fail, and should make the test pass on all configurations. Task-number: QTBUG-65861 Change-Id: Icfd86831b527da4933da2a20f45ccf9617862eac Reviewed-by: Lorn Potter (cherry picked from commit e3b6a54a75482c5ddd91dab50a86629053c69a2e) --- .../tst_sensorgestures_gestures.cpp | 31 +++++++++++++++------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp index ee242109..69dcce9e 100644 --- a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp +++ b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp @@ -87,6 +87,7 @@ void tst_sensorgestures_gestures::initTestCase() void tst_sensorgestures_gestures::testSingleGestures() { QFETCH(QString, gestureId); + QFETCH(QStringList, gestureSignals); QString name = "mock_data/sensordata_" + gestureId + ".dat"; @@ -105,21 +106,31 @@ void tst_sensorgestures_gestures::testSingleGestures() gesture.data()->startDetection(); QCOMPARE(gesture->isActive(),true); - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); + auto toStringList = [](const QList> list) { + QStringList result; + for (const QList &item: list) { + if (!item.isEmpty()) + result << item.first().toString(); + } + return result; + }; + + QTRY_COMPARE_WITH_TIMEOUT(toStringList(spy_gesture), gestureSignals, 7000); } void tst_sensorgestures_gestures::testSingleGestures_data() { QTest::addColumn("gestureId"); - QTest::newRow("cover") << "cover"; - QTest::newRow("doubletap") << "doubletap"; - QTest::newRow("hover") << "hover"; - QTest::newRow("pickup") << "pickup"; - QTest::newRow("shake2") << "shake2"; //multi? - QTest::newRow("slam") << "slam"; - QTest::newRow("turnover") << "turnover"; - QTest::newRow("twist") << "twist"; //multi? - QTest::newRow("whip") << "whip"; + QTest::addColumn("gestureSignals"); + QTest::newRow("cover") << "cover" << QStringList({ "cover"}); + QTest::newRow("doubletap") << "doubletap" << QStringList({ "doubletap" }); + QTest::newRow("hover") << "hover" << QStringList({ "hover" }); + QTest::newRow("pickup") << "pickup" << QStringList({ "pickup" }); + QTest::newRow("shake2") << "shake2" << QStringList({ "shakeRight" }); + QTest::newRow("slam") << "slam" << QStringList({ "slam" }); + QTest::newRow("turnover") << "turnover" << QStringList({ "turnover" }); + QTest::newRow("twist") << "twist" << QStringList({ "twistLeft", "twistLeft", "twistRight" }); + QTest::newRow("whip") << "whip" << QStringList({ "whip" }); } void tst_sensorgestures_gestures::testSingleDataset2Gestures() -- cgit v1.2.3 From 5b5a7b4d1f49960d2b7b80735bd4eb6340b1acf0 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 12 Jan 2018 13:24:12 +0100 Subject: qtlite: Skip building examples when configured with no-feature-itemviews Task-number: QTBUG-53141 Change-Id: I98086d0c1877b8345ee76553eea19738023aebae Reviewed-by: Alex Blasche --- examples/sensors/sensorgestures/sensorgestures.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro index a60728e7..e692a53c 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/sensors/sensorgestures/sensorgestures.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = gesture QT += sensors widgets +requires(qtConfig(treewidget)) SOURCES += main.cpp\ mainwindow.cpp -- cgit v1.2.3