diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
| commit | 0f1f7fb97fd0dd572ad61a0ebaef68c2bba72e57 (patch) | |
| tree | e1f3f1b58aa69904e6bc629e88ed68fca858f83a /tests/auto/widgets/kernel | |
| parent | e8c70fb07f01b492b721451c00496f860eb40be0 (diff) | |
| parent | 5bb178c479a247720fbc3fbb7f06a32b725193ac (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetrepaintmanager.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Ifae457d0427be8e2465e474b055722e11b3b1e5c
Diffstat (limited to 'tests/auto/widgets/kernel')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/BLACKLIST | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST index ac65a97c40..c68c7d6b14 100644 --- a/tests/auto/widgets/kernel/qapplication/BLACKLIST +++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST @@ -1,4 +1,3 @@ [touchEventPropagation] -opensuse-leap # QTBUG-66745 -opensuse-42.3 +opensuse-leap diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST index 02e97e4b4e..26f9ce1b85 100644 --- a/tests/auto/widgets/kernel/qwidget/BLACKLIST +++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST @@ -14,12 +14,9 @@ rhel-7.4 ubuntu-16.04 rhel-7.6 [focusProxyAndInputMethods] -ubuntu-16.04 rhel-7.6 opensuse-leap -ubuntu-18.04 -rhel-7.4 -opensuse-42.3 +ubuntu [raise] opensuse-leap # QTBUG-68175 @@ -45,12 +42,9 @@ opensuse-leap [moveInResizeEvent] ubuntu-16.04 [multipleToplevelFocusCheck] -ubuntu-16.04 rhel-7.6 opensuse-leap -ubuntu-18.04 -rhel-7.4 -opensuse-42.3 +ubuntu [windowState] # QTBUG-75270 winrt |