diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:49 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:49 +0300 |
| commit | 94d2d862bd6fd6d192a18272ffc465f873e74a69 (patch) | |
| tree | 4fdd06a420f9325ba72b5bcdacc8200e58753dba | |
| parent | 374d71e29a142bd177cd5b1b7e29a4628085ddcb (diff) | |
| parent | 11cb078e021b1c99915012ea9446622402278332 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: Iec2b0433e07854cc734b006ad4cf36a112069f4d
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qaudiodeviceinfo/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/BLACKLIST | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 33171164d..22740a862 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.13 +MODULE_VERSION = 5.15.14 diff --git a/tests/auto/integration/qaudiodeviceinfo/BLACKLIST b/tests/auto/integration/qaudiodeviceinfo/BLACKLIST index 40dc63a09..d1a68064b 100644 --- a/tests/auto/integration/qaudiodeviceinfo/BLACKLIST +++ b/tests/auto/integration/qaudiodeviceinfo/BLACKLIST @@ -2,3 +2,5 @@ [deviceName] redhatenterpriselinuxworkstation-6.6 +[codecs] +sles-15.4 # QTBUG-111296 diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index e91f47755..bc3cb34c1 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -44,3 +44,6 @@ redhatenterpriselinuxworkstation-6.6 [surfaceTest] redhatenterpriselinuxworkstation-6.6 + +[playlistObject] +sles-15.4 # QTBUG-112930 |