From a86b3d76a505d5a8e3b04047e9f7944836b34304 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 26 Sep 2012 16:34:29 +0200 Subject: [PATCH] tst_QMessageBox: fix Q_OS_MAC usage Change-Id: I1a3c1c88956d85343e693588ca0522c4b7d62072 Reviewed-by: Sergio Ahumada --- tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 7d64224..17b574f 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -121,7 +121,9 @@ private slots: void detailsText(); void detailsButtonText(); +#ifndef Q_OS_MAC void shortcut(); +#endif void staticSourceCompat(); void instanceSourceCompat(); @@ -361,17 +363,17 @@ void tst_QMessageBox::statics() } } +// shortcuts are not used on MAC OS X +#ifndef Q_OS_MAC void tst_QMessageBox::shortcut() { -#ifdef Q_OS_MAC - QSKIP("shortcuts are not used on MAC OS X"); -#endif QMessageBox msgBox; msgBox.addButton("O&k", QMessageBox::YesRole); msgBox.addButton("&No", QMessageBox::YesRole); msgBox.addButton("&Maybe", QMessageBox::YesRole); QCOMPARE(exec(&msgBox, Qt::Key_M), 2); } +#endif void tst_QMessageBox::about() { -- 2.7.4