From 171c638a89c64cd421c44556c422f4cef2596fab Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 27 Sep 2012 16:04:16 +0200 Subject: [PATCH] tst_QLabel: remove QSKIP, wrap Q_OS_MAC Change-Id: If67dbb07900bfa8f1bcf55aa457bd90ef0550900 Reviewed-by: Sergio Ahumada --- tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 8 +++++--- 1 file 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 8f27f46..350354a 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() { -- 2.7.4