diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-27 15:55:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 21:13:52 +0200 |
| commit | 70bef120b7446983ee659ab3393e3aad871d48b9 (patch) | |
| tree | d8092e917d736b62cff06d615a972e2d7f03826e /tests/auto/widgets/widgets | |
| parent | cea7a87d5fe482afa83a8b610b5b39ce83ab27c9 (diff) | |
tst_QMainWindow: remove QSKIP, wrap Q_OS_MAC
Change-Id: Ided3c4cbdc7508a36e96351b5f60d79532bb7f26
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 899f9ce543..1e91c63f16 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() { |