summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-18 10:32:32 +0200
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-18 12:37:02 +0200
commit5dc610c1ee0fd6230009d7a4bdcb13ec56873438 (patch)
treee6a01b5bafa23c67831d2a5c3e3bfac9f4bc5542
parent17d0bca7afab7432194db38609c7397bfd4806ae (diff)
fix tst_QMainWindow::menuBar for Windows mobile
Reviewed-by: thartman
-rw-r--r--tests/auto/qmainwindow/tst_qmainwindow.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index 9a436b5fa..b5c75cd04 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);