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/dialogs/qmessagebox/tst_qmessagebox.cpp | |
| 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/dialogs/qmessagebox/tst_qmessagebox.cpp')
| -rw-r--r-- | tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 8e2b1882d5..b598c00434 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -48,7 +48,7 @@ #include <QApplication> #include <QPushButton> #include <QDialogButtonBox> -#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) +#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) #include <QMacStyle> #endif #if !defined(QT_NO_STYLE_CLEANLOOKS) @@ -363,7 +363,7 @@ void tst_QMessageBox::statics() void tst_QMessageBox::shortcut() { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QSKIP("shortcuts are not used on MAC OS X"); #endif QMessageBox msgBox; @@ -380,7 +380,7 @@ void tst_QMessageBox::about() QMessageBox::about(0, "Caption", "This is an auto test"); // On Mac, about and aboutQt are not modal, so we need to // explicitly run the event loop -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QTRY_COMPARE(keyToSend, -1); #else QCOMPARE(keyToSend, -1); @@ -393,7 +393,7 @@ void tst_QMessageBox::about() #endif sendKeySoon(); QMessageBox::aboutQt(0, "Caption"); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QTRY_COMPARE(keyToSend, -1); #else QCOMPARE(keyToSend, -1); @@ -409,7 +409,7 @@ void tst_QMessageBox::staticSourceCompat() sendKeySoon(); ret = QMessageBox::information(0, "title", "text", QMessageBox::Yes, QMessageBox::No); int expectedButton = int(QMessageBox::Yes); -#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) +#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) if (qobject_cast<QMacStyle *>(qApp->style())) expectedButton = int(QMessageBox::No); #elif !defined(QT_NO_STYLE_CLEANLOOKS) @@ -481,7 +481,7 @@ void tst_QMessageBox::instanceSourceCompat() QCOMPARE(exec(&mb, Qt::Key_Enter), int(QMessageBox::Yes)); QCOMPARE(exec(&mb, Qt::Key_Escape), int(QMessageBox::Cancel)); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC // mnemonics are not used on Mac OS X QCOMPARE(exec(&mb, Qt::ALT + Qt::Key_R), 0); QCOMPARE(exec(&mb, Qt::ALT + Qt::Key_Z), 1); |