From 4f029ca5bc75831bd5950dcb6747f2a683d5013b Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 31 Dec 2021 15:31:35 +0200 Subject: Bump version --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 48f4c9ef9..213056f59 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.8 +MODULE_VERSION = 5.15.9 -- cgit v1.2.1 From 397d899b2fe46f3b22daf4a282b9044c256de60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 4 Feb 2022 12:08:05 +0100 Subject: Blacklist tst_QAudioOutput on macOS ARM It's flakey. Task-number: QTBUG-99362 Change-Id: I40b4525d1710a68da174635cf067876eeb7331b4 Reviewed-by: Timur Pocheptsov --- tests/auto/integration/qaudiooutput/BLACKLIST | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index 966b48af6..22ed580c3 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -1 +1,2 @@ linux ci +macos arm -- cgit v1.2.1 From 01d5059a5060283eb20e1a5afbebab790e8a0cf1 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Fri, 4 Mar 2022 13:47:04 +0200 Subject: Fix duration() with very long media with gstreamer Fixes: QTBUG-101450 Change-Id: I93ab8a9b788eb74b4ef2227b90e30a42a84b9fd6 Reviewed-by: Lars Knoll --- src/gsttools/qgstreamerplayersession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp index 12f8574f5..7902df77a 100644 --- a/src/gsttools/qgstreamerplayersession.cpp +++ b/src/gsttools/qgstreamerplayersession.cpp @@ -1587,7 +1587,7 @@ void QGstreamerPlayerSession::updateVideoResolutionTag() void QGstreamerPlayerSession::updateDuration() { gint64 gstDuration = 0; - int duration = 0; + qint64 duration = 0; if (m_pipeline && qt_gst_element_query_duration(m_pipeline, GST_FORMAT_TIME, &gstDuration)) duration = gstDuration / 1000000; -- cgit v1.2.1