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/qspinbox | |
| 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/qspinbox')
| -rw-r--r-- | tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index a58705f224..9fef691688 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -378,7 +378,7 @@ void tst_QSpinBox::setTracking_data() QStringList texts1; QStringList texts2; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC keys.addKeyClick(Qt::Key_Right, Qt::ControlModifier); #else keys.addKeyClick(Qt::Key_End); @@ -824,13 +824,13 @@ void tst_QSpinBox::removeAll() spin.setSuffix("bar"); spin.setValue(2); spin.show(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QTest::keyClick(&spin, Qt::Key_Left, Qt::ControlModifier); #else QTest::keyClick(&spin, Qt::Key_Home); #endif -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QTest::keyClick(&spin, Qt::Key_Right, Qt::ControlModifier|Qt::ShiftModifier); #else QTest::keyClick(&spin, Qt::Key_End, Qt::ShiftModifier); @@ -845,7 +845,7 @@ void tst_QSpinBox::startWithDash() { SpinBox spin(0); spin.show(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QTest::keyClick(&spin, Qt::Key_Left, Qt::ControlModifier); #else QTest::keyClick(&spin, Qt::Key_Home); |