diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:16 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:16 +0200 |
| commit | 9dbea27ea43206c2d210e4b4cc48af169ada3847 (patch) | |
| tree | 920bb496afe167f4e9b4f784d74e8c45a3bebc93 | |
| parent | f03440793e1638687d0754b82d206817dc3775e7 (diff) | |
| parent | 01d5059a5060283eb20e1a5afbebab790e8a0cf1 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I130d0256d152d5c8bf44db8f5218100d6ea898f0
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/gsttools/qgstreamerplayersession.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qaudiooutput/BLACKLIST | 1 |
3 files changed, 3 insertions, 2 deletions
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 diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp index adf11b022..d36f73b2a 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; 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 |