From 5dc610c1ee0fd6230009d7a4bdcb13ec56873438 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 18 Aug 2009 10:32:32 +0200 Subject: fix tst_QMainWindow::menuBar for Windows mobile Reviewed-by: thartman --- tests/auto/qmainwindow/tst_qmainwindow.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index 9a436b5..b5c75cd 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -550,7 +550,11 @@ void tst_QMainWindow::menuBar() mw.setMenuBar(mb1); QVERIFY(mw.menuBar() != 0); QCOMPARE(mw.menuBar(), (QMenuBar *)mb1); +#ifdef Q_OS_WINCE_WM + QCOMPARE(mb1->parentWidget(), (QWidget*)0); +#else QCOMPARE(mb1->parentWidget(), (QWidget *)&mw); +#endif mw.setMenuBar(0); QVERIFY(mw.menuBar() != 0); @@ -561,7 +565,11 @@ void tst_QMainWindow::menuBar() mw.setMenuBar(mb2); QVERIFY(mw.menuBar() != 0); QCOMPARE(mw.menuBar(), (QMenuBar *)mb2); +#ifdef Q_OS_WINCE_WM + QCOMPARE(mb2->parentWidget(), (QWidget*)0); +#else QCOMPARE(mb2->parentWidget(), (QWidget *)&mw); +#endif mw.setMenuBar(0); QVERIFY(mw.menuBar() != 0); -- cgit v0.12