From: J-P Nurmi Date: Thu, 27 Sep 2012 13:55:36 +0000 (+0200) Subject: tst_QMainWindow: remove QSKIP, wrap Q_OS_MAC X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70bef120b7446983ee659ab3393e3aad871d48b9;p=profile%2Fivi%2Fqtbase.git tst_QMainWindow: remove QSKIP, wrap Q_OS_MAC Change-Id: Ided3c4cbdc7508a36e96351b5f60d79532bb7f26 Reviewed-by: Sergio Ahumada --- diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 899f9ce..1e91c63 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -145,7 +145,9 @@ private slots: void dockWidgetSize(); void QTBUG2774_stylechange(); void QTBUG15080_restoreState(); +#ifdef Q_OS_MAC void toggleUnifiedTitleAndToolBarOnMac(); +#endif void QTBUG21378_animationFinished(); }; @@ -1792,9 +1794,9 @@ void tst_QMainWindow::QTBUG15080_restoreState() QCOMPARE(dw2->width(), 101); } +#ifdef Q_OS_MAC void tst_QMainWindow::toggleUnifiedTitleAndToolBarOnMac() { -#ifdef Q_OS_MAC QMainWindow mw; QToolBar *tb = new QToolBar; tb->addAction("Test"); @@ -1806,10 +1808,8 @@ void tst_QMainWindow::toggleUnifiedTitleAndToolBarOnMac() QVERIFY(frameGeometry.topLeft() == mw.frameGeometry().topLeft()); mw.setUnifiedTitleAndToolBarOnMac(true); QVERIFY(frameGeometry.topLeft() == mw.frameGeometry().topLeft()); -#else - QSKIP("Mac specific test"); -#endif } +#endif void tst_QMainWindow::QTBUG21378_animationFinished() {