diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:33 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:33 +0300 |
| commit | 9bf4d03e2515f7c454647d54542330b6e90f8191 (patch) | |
| tree | 2a7da47f10e6f19fa135c76780d18415f3d0decb | |
| parent | 67bee4599a28e1cadc14ed9ea4adc7061e250b90 (diff) | |
| parent | 5c2d45822a0121a45fc4979bddccde2948881a58 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: I7a249c51e1d3e21a78bb3f4225879784e964aee0
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/quick3d/dynamicnodecreation/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/render/opengl/graphicshelpergl4/BLACKLIST | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 74ed94e7c..550ad82b2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -6,4 +6,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 diff --git a/tests/auto/quick3d/dynamicnodecreation/BLACKLIST b/tests/auto/quick3d/dynamicnodecreation/BLACKLIST index a1b7ead84..5a740af23 100644 --- a/tests/auto/quick3d/dynamicnodecreation/BLACKLIST +++ b/tests/auto/quick3d/dynamicnodecreation/BLACKLIST @@ -1,3 +1,4 @@ # See qtbase/src/testlib/qtestblacklist.cpp for format [createEntityAndDynamicChild] ci ubuntu-20.04 # QTBUG-106519 +sles-15.4 # QTBUG-102315 diff --git a/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST b/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST index a2da1ff1d..08e743315 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST +++ b/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST @@ -2,3 +2,5 @@ #QTBUG-101556 [bindFrameBufferAttachment] ubuntu-20.04 +# QTBUG-111291 +sles-15.4 |