diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:06 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:06 +0300 |
| commit | dcc90558d9c0cba41eec7df290943994289b0e87 (patch) | |
| tree | c1ec50ef484b7ab810790c605d2264c7011c5094 | |
| parent | 0ea7cfdfbfa72d467fe542cc48ab3206c177a387 (diff) | |
| parent | 7d77ce5053b064dd91d4ee96aa8ad8c2eb8921cc (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: I90007f123b4aa0cad4d1a7782b43ddf9d9fb2f99
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/controls/BLACKLIST | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index c43aa0d17..ee83ccd24 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.10 +MODULE_VERSION = 5.15.11 diff --git a/tests/auto/controls/BLACKLIST b/tests/auto/controls/BLACKLIST index ddf33812f..7ce654da1 100644 --- a/tests/auto/controls/BLACKLIST +++ b/tests/auto/controls/BLACKLIST @@ -1,3 +1,5 @@ -# QTBUG-79161 -[Tests_TableView::test_headervisible] -macos +# QTBUG-79161
+[Tests_TableView::test_headervisible]
+macos
+[Tests_StackLayout::test_addAndRemoveItems]
+*
|