From f239dbe60a075f6115d9933a3c53f49fdfbc6a2d Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 27 Oct 2017 11:10:13 +0200 Subject: tests: enforce Qt menubar in tst_QMenuBar::taskQTBUG56860_focus ... the same way other tests do in this file. Change-Id: Ifcaee084bd20c55d6b9f7ddcf35daebce2a02e07 Reviewed-by: Friedemann Kleint --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 9a70208b94..9325be17b9 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -719,9 +719,7 @@ void tst_QMenuBar::taskQTBUG56860_focus() #endif QMainWindow w; QMenuBar *mb = w.menuBar(); - - if (mb->platformMenuBar()) - QSKIP("This test requires the Qt menubar."); + mb->setNativeMenuBar(false); QMenu *em = mb->addMenu("&Edit"); em->setObjectName("EditMenu"); -- cgit v1.2.3 From 754b636053869d8b673a0e131ae6470a5adace3b Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 27 Oct 2017 11:38:22 +0200 Subject: tests: use QSKIP for temporarily disabled tests Change-Id: Ib088e943668d00cbbd0e6e04ab7d565477b0cc51 Reviewed-by: Friedemann Kleint --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 9325be17b9..bc50e4f1d8 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -763,8 +763,7 @@ void tst_QMenuBar::check_homeKey() { // I'm temporarily shutting up this testcase. // Seems like the behaviour i'm expecting isn't ok. - QVERIFY( true ); - return; + QSKIP("This test has been \"temporarily\" disabled at least since 2009 :)"); QEXPECT_FAIL( "0", "Popupmenu should respond to a Home key", Abort ); @@ -805,8 +804,7 @@ void tst_QMenuBar::check_endKey() { // I'm temporarily silenting this testcase. // Seems like the behaviour i'm expecting isn't ok. - QVERIFY( true ); - return; + QSKIP("This test has been \"temporarily\" disabled at least since 2009 :)"); QEXPECT_FAIL( "0", "Popupmenu should respond to an End key", Abort ); -- cgit v1.2.3