whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Bradley T. Hughes 2012-01-16 12:02:48 +01:00 committed by Qt by Nokia
parent 114079e224
commit 3ad7cd3a60
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -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"));

4
tests/auto/other/qcomplextext/tst_qcomplextext.cpp
View File

@ -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

8
tests/auto/other/qfocusevent/tst_qfocusevent.cpp
View File

@ -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
}