From 571545590149fe9bb3cce308490d66ac2c3f1318 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 10 Oct 2012 12:46:37 +0200 Subject: [PATCH] tst_QApplication: Make sure the native style is being used The tst_QApplication::args() auto-test sets the style to windows style but there is no way to reset the style back to the native one. This makes tst_QApplication::focusChanged() fail on Mac in some cases, since not all the styles respond the same way to tab vs. strong focus changes. Change-Id: I91e39c1dd0fad4d90f3a13ab50a5e9758922ac28 Reviewed-by: Frederik Gladhorn --- tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 2250fe390fa..2a3a3a166ec 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -516,6 +516,8 @@ void tst_QApplication::args() QCOMPARE( argv_out, args_out ); delete [] argv; + // Make sure we switch back to native style. + QApplicationPrivate::styleOverride = QString(); } void tst_QApplication::appName()