From 28f36ebcc246c90f82355bb0a40b3cca07913fae Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 2 Nov 2012 14:18:54 +0100 Subject: Fix progressbar animation on macstyle The animation is not just supposed to run when indeterminate, but also while it is progressing. Change-Id: If176bd230c2f6f83781e01ea77526c24d54c8477 Reviewed-by: J-P Nurmi --- tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index 7024da9dd4..9ec249cae0 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp @@ -58,7 +58,9 @@ private slots: void text(); void format(); void setValueRepaint(); +#ifndef Q_OS_MAC void setMinMaxRepaint(); +#endif void sizeHint(); void formatedText_data(); void formatedText(); @@ -212,6 +214,10 @@ void tst_QProgressBar::setValueRepaint() } } +// This test is invalid on Mac, since progressbars +// are animated there + +#ifndef Q_OS_MAC void tst_QProgressBar::setMinMaxRepaint() { ProgressBar pbar; @@ -247,6 +253,7 @@ void tst_QProgressBar::setMinMaxRepaint() QTRY_VERIFY(pbar.repainted); } } +#endif //Q_OS_MAC void tst_QProgressBar::sizeHint() { -- cgit v1.2.3