Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp
index 25b47ee836..f521b64bed 100644
--- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -82,6 +82,8 @@ private slots:
     void singleWidgetTest();
     void lineEditTest();
     void hierarchyTest();
+    void notificationsTest();
+
 private:
     AccessibleTestWindow *m_window;
 };
@@ -123,6 +125,7 @@ void tst_QAccessibilityMac::lineEditTest()
     m_window->addWidget(lineEdit);
     QVERIFY(QTest::qWaitForWindowExposed(m_window));
     QCoreApplication::processEvents();
+
     QVERIFY(testLineEdit());
 }
 
@@ -148,5 +151,13 @@ void tst_QAccessibilityMac::hierarchyTest()
     QVERIFY(testHierarchy(w));
 }
 
+void tst_QAccessibilityMac::notificationsTest()
+{
+    if (!macNativeAccessibilityEnabled())
+        return;
+
+    QVERIFY(notifications(m_window));
+}
+
 QTEST_MAIN(tst_QAccessibilityMac)
 #include "tst_qaccessibilitymac.moc"