diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-16 12:02:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 11:31:22 +0100 |
| commit | 3ad7cd3a606e54eac43f9a0ed0ba05961540e8a3 (patch) | |
| tree | d6e77618a1dff05b3e405dc903e15e74692afcf1 /tests/auto | |
| parent | 114079e224af9a4148e9d2ad5f951e330857f154 (diff) | |
Replace Q_WS_MAC with Q_OS_MAC in tests/auto/other
Change-Id: If805ea762047d07872a278956fc7637e5bafc6db
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/other/qcomplextext/tst_qcomplextext.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 62bc043080..a0faafc063 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1259,7 +1259,7 @@ void tst_QAccessibility::menuTest() QCOMPARE(iSeparator->role(), QAccessible::Separator); QCOMPARE(iHelp->role(), QAccessible::MenuItem); QCOMPARE(iAction->role(), QAccessible::MenuItem); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC #ifdef Q_OS_WINCE if (!IsValidCEPlatform()) QSKIP("Tests do not work on Mobile platforms due to native menus"); @@ -2687,7 +2687,7 @@ void tst_QAccessibility::accelerators() label->setText(tr("Q &&A")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator), QString()); -#if !defined(QT_NO_DEBUG) && !defined(Q_WS_MAC) +#if !defined(QT_NO_DEBUG) && !defined(Q_OS_MAC) QTest::ignoreMessage(QtWarningMsg, "QKeySequence::mnemonic: \"Q &A&B\" contains multiple occurrences of '&'"); #endif label->setText(tr("Q &A&B")); diff --git a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp index c741a76a7e..5e6831fa78 100644 --- a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp +++ b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp @@ -42,7 +42,7 @@ // Horrible hack, but this get this out of the way for now // Carlos Duclos, 2007-12-11 -#if !defined(Q_WS_MAC) +#if !defined(Q_OS_MAC) #include <QtTest/QtTest> #include <QtGui/QtGui> @@ -286,5 +286,5 @@ void tst_QComplexText::bidiCursor_PDF() QTEST_MAIN(tst_QComplexText) #include "tst_qcomplextext.moc" -#endif // Q_WS_MAC +#endif // Q_OS_MAC diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 9f82a72f65..4b01d32473 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -136,7 +136,7 @@ void tst_QFocusEvent::initTestCase() testFocusWidget->resize( 200,100 ); testFocusWidget->show(); // Applications don't get focus when launched from the command line on Mac. -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC testFocusWidget->raise(); #endif } @@ -279,7 +279,7 @@ void tst_QFocusEvent::checkReason_Popup() QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); } -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QT_BEGIN_NAMESPACE extern void qt_set_sequence_auto_mnemonic(bool); QT_END_NAMESPACE @@ -288,7 +288,7 @@ QT_END_NAMESPACE void tst_QFocusEvent::checkReason_Shortcut() { initWidget(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC qt_set_sequence_auto_mnemonic(true); #endif QLabel* label = new QLabel( "&Test", testFocusWidget ); @@ -318,7 +318,7 @@ void tst_QFocusEvent::checkReason_Shortcut() label->hide(); QVERIFY( childFocusWidgetTwo->hasFocus() ); QVERIFY( !childFocusWidgetOne->hasFocus() ); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC qt_set_sequence_auto_mnemonic(false); #endif } |