diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-16 11:49:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-23 09:32:43 +0100 |
| commit | ba21ca7b5b4b92996c93a0dc4137ea181c4eb79c (patch) | |
| tree | dec5949a8ff5ed31bb847718c3766907687b7057 /tests/auto/widgets/widgets/qabstractslider | |
| parent | fdedb49b76b8f9ad69611fbfea6b8371ae1ec3a1 (diff) | |
Replace Q_WS_MAC with Q_OS_MAC in tests/auto/widgets
tst_qwidget.cpp will not build/link without tst_qwidget_mac_helpers.mm,
so re-add it to the build as well.
Change-Id: I55130f62c215c4b82683d90456e31fdb09f833a8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qabstractslider')
| -rw-r--r-- | tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index 1307be315f..c046f9f471 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -732,7 +732,7 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Vertical) // orientation of slider << int(Qt::Vertical) // orientation of wheel -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC << 1 // expected position after #else // We don't restrict scrolling to pageStep on Mac @@ -750,7 +750,7 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Vertical) // orientation of wheel -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC << 1 // expected position after #else // We don't restrict scrolling to pageStep on Mac @@ -769,7 +769,7 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Vertical) // orientation of wheel -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC << 1 // expected position after #else // We don't restrict scrolling to pageStep on Mac |