diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:39:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:46:20 +0100 |
| commit | 246799d8a7bf42c1f22fca7ef6d77e8d58054bad (patch) | |
| tree | a0b92a804d7d2a30cd68fa327df5777d8bcc36ba /tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | |
| parent | 5ad191850becd7dc1d61d0975f141a5db64e6373 (diff) | |
| parent | 02cc57f4edbae450ecfa8368052afa44f8aeee19 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
examples/network/network-chat/peermanager.cpp
src/widgets/util/qsystemtrayicon.cpp
src/widgets/util/qsystemtrayicon_qpa.cpp
src/widgets/util/qsystemtrayicon_win.cpp
src/widgets/util/qsystemtrayicon_x11.cpp
Change-Id: I1c026df83818c0ccaf956980370e7522960627db
Diffstat (limited to 'tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index f8dc5d91a2..4d57b85f9a 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -137,6 +137,7 @@ private slots: void QTBUG_57404_existingMenuItemException(); #endif void taskQTBUG55966_subMenuRemoved(); + void QTBUG_58344_invalidIcon(); void platformMenu(); @@ -1635,5 +1636,14 @@ void tst_QMenuBar::taskQTBUG55966_subMenuRemoved() QTest::qWait(500); } +void tst_QMenuBar::QTBUG_58344_invalidIcon() +{ + QMenuBar menuBar; + QMenu menu("menu"); + menu.addAction(QIcon("crash.png"), "crash"); + menuBar.addMenu(&menu); + // No crash, all fine. +} + QTEST_MAIN(tst_QMenuBar) #include "tst_qmenubar.moc" |