diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 15:18:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 15:18:02 +0200 |
| commit | 6370c3aa719bd7c1327cef88d263841ba28bb010 (patch) | |
| tree | 46960631e7abbeaa40e019f6e31c2be5a18e6b92 /tests/auto/other | |
| parent | b9a32351c8582ede87b6c63967f5c832c0622645 (diff) | |
| parent | ef416e0faaa83cd122038db397dd24d949c9cafe (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Also bump minimum required Qt version for Android: Ministro updates.
Conflicts:
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
src/plugins/platforms/android/androidjnimain.cpp
Change-Id: I966f249bebf92da37bfdeb995ad21b027eb03301
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/macnativeevents/BLACKLIST | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST index 4129868022..3e68ba0cf0 100644 --- a/tests/auto/other/macnativeevents/BLACKLIST +++ b/tests/auto/other/macnativeevents/BLACKLIST @@ -2,8 +2,7 @@ [testDragWindow] osx [testMouseEnter] -osx-10.9 -osx-10.8 +osx [testChildDialogInFrontOfModalParent] osx [testChildWindowInFrontOfStaysOnTopParentWindow] |