summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-21 04:49:41 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-04-21 05:31:24 (GMT)
commit60e5ed805af1e11aaec426b823df209b4c895c29 (patch)
treef189d54d05bfb4628c5d23ed712c4732de476bd3
parent59634e825f1efa6f32befc8767cafedfeb9b7d59 (diff)
downloadQt-60e5ed805af1e11aaec426b823df209b4c895c29.zip
Qt-60e5ed805af1e11aaec426b823df209b4c895c29.tar.gz
Qt-60e5ed805af1e11aaec426b823df209b4c895c29.tar.bz2
Only ignore warning when it can actually be produced.
Fix regression introduced in 3ca51d87296bcb3098d7de14294fef9294fd5ed4. The warning is only generated in builds where QT_NO_DEBUG is not defined *and* the target is not Mac OS X. Change-Id: I7245f2eab8ea47ab7495fef874b2f8a29186b659 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
-rw-r--r--tests/auto/qaccessibility/tst_qaccessibility.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 2645090..254fdf7 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -3835,7 +3835,7 @@ void tst_QAccessibility::accelerators()
label->setText(tr("Q &&A"));
QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString());
-#ifndef QT_NO_DEBUG
+#if !defined(QT_NO_DEBUG) && !defined(Q_WS_MAC)
QTest::ignoreMessage(QtWarningMsg, "QKeySequence::mnemonic: \"Q &A&B\" contains multiple occurrences of '&'");
#endif
label->setText(tr("Q &A&B"));