diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-27 16:04:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 21:13:52 +0200 |
| commit | 171c638a89c64cd421c44556c422f4cef2596fab (patch) | |
| tree | 215e057e57b09e57bbe65fd49148c7e3dfe279be /tests/auto/widgets/widgets/qlabel | |
| parent | 41dc50edff73116f906c9eefea853921d8588805 (diff) | |
tst_QLabel: remove QSKIP, wrap Q_OS_MAC
Change-Id: If67dbb07900bfa8f1bcf55aa457bd90ef0550900
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qlabel')
| -rw-r--r-- | tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index 8f27f46276..350354a5b2 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -87,7 +87,9 @@ private slots: void setText_data(); void setText(); void setTextFormat(); +#ifndef Q_OS_MAC void setBuddy(); +#endif void setNum(); void clear(); void wordWrap(); @@ -193,11 +195,10 @@ void tst_QLabel::cleanup() } } +// Set buddy doesn't make much sense on Mac OS X +#ifndef Q_OS_MAC void tst_QLabel::setBuddy() { -#ifdef Q_OS_MAC - QSKIP("Set buddy doesn't make much sense on Mac OS X"); -#endif testWidget->hide(); test_box = new Widget; @@ -218,6 +219,7 @@ void tst_QLabel::setBuddy() QVERIFY( test_edit->hasFocus() ); delete test_box; } +#endif void tst_QLabel::setText_data() { |