diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:18 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:18 +0200 |
| commit | 4f55c4181682538e6b1ac2609d907889ca14a02e (patch) | |
| tree | ac5f33586e3b3b8acab4a95efe1e16978a3e37b2 /tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | |
| parent | 457ab46936f4c90099a0f1b16abaff5312037fdb (diff) | |
| parent | 7a59d6f138ff8799170cc03d709525ab965d703a (diff) | |
Merge 5.14 into 5.14.1
Change-Id: Ie90edfd16f48e1907fd18288473ac403f62b9032
Diffstat (limited to 'tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 9c40c0bd57..727d1c2a16 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -1066,6 +1066,10 @@ static inline QByteArray msgGeometryIntersects(const QRect &r1, const QRect &r2) void tst_QMenu::pushButtonPopulateOnAboutToShow() { +#ifdef Q_OS_MACOS + QSKIP("Popup menus may partially overlap the button on macOS, and that's okey"); +#endif + QPushButton b("Test PushButton"); b.setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint); |