1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index cba8675bee..4d52e6215e 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -69,6 +69,10 @@
 #include <windows.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+extern bool Q_GUI_EXPORT qt_tab_all_widgets; // from qapplication.cpp
+QT_END_NAMESPACE
+
 class tst_QApplication : public QObject
 {
 Q_OBJECT
@@ -1525,8 +1529,15 @@ void tst_QApplication::focusChanged()
     QSettings appleSettings(QLatin1String("apple.com"));
     QVariant appleValue = appleSettings.value(QLatin1String("AppleKeyboardUIMode"), 0);
     tabAllControls = (appleValue.toInt() & 0x2);
+    if (!tabAllControls) {
+        QEXPECT_FAIL("", "QTBUG-24372 Mac tab key \"Text boxes and lists only\" vs "
+                         "\"All controls\" setting is not respected in Qt5", Abort);
+    }
 #endif
 
+    // make sure Qt's idea of tabbing between widgets matches what we think it should
+    QCOMPARE(qt_tab_all_widgets, tabAllControls);
+
     tab.simulate(now);
     if (!tabAllControls) {
         QVERIFY(spy.count() == 0);