diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:31:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:31:31 +0200 |
| commit | a4cef2531fc29d874cec9613e2d2ad7ccd5ad937 (patch) | |
| tree | 5539faab39cbb372a1530b115e9b9dc1e09492ae /tests/auto/widgets/qwebengineview | |
| parent | 4746bb904bf6841137d5b50357bf79c852bf5d06 (diff) | |
| parent | d35cd072c3f56aa285871a151adc30d9d81f3ea3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
tests/auto/quick/qmltests/BLACKLIST
tests/auto/quick/qquickwebengineview/BLACKLIST
Change-Id: I29b68dec8692d0369a2dda56350ee62d3ad73e08
Diffstat (limited to 'tests/auto/widgets/qwebengineview')
| -rw-r--r-- | tests/auto/widgets/qwebengineview/BLACKLIST | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST index 9a574a687..21a876c88 100644 --- a/tests/auto/widgets/qwebengineview/BLACKLIST +++ b/tests/auto/widgets/qwebengineview/BLACKLIST @@ -1,6 +1,3 @@ -[doNotSendMouseKeyboardEventsWhenDisabled] -windows - [microFocusCoordinates] osx |