summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2010-12-16 13:09:35 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2010-12-17 12:00:25 (GMT)
commitc60a2a5e5136cfec74429114c6c74401fdda65a3 (patch)
treefb489443cc438add60a18bd58705d010e0c42c28
parenta97cf9553ff841dcfd45bbc85ff05b0aafd4a548 (diff)
downloadQt-c60a2a5e5136cfec74429114c6c74401fdda65a3.zip
Qt-c60a2a5e5136cfec74429114c6c74401fdda65a3.tar.gz
Qt-c60a2a5e5136cfec74429114c6c74401fdda65a3.tar.bz2
Windows Vista and 7 also have animated progress bars
Which means they get paint events all the time. Reviewed-by: Jens Bache-Wiig
-rw-r--r--tests/auto/qprogressbar/tst_qprogressbar.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp
index 7d94e3c..e042fb8 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp
@@ -179,10 +179,15 @@ void tst_QProgressBar::format()
bar.repainted = false;
bar.setFormat("%v of %m (%p%)");
qApp->processEvents();
+
#ifndef Q_WS_MAC
- // The Mac scroll bar is animated, which means we get paint events all the time.
+ // Animated scroll bars get paint events all the time
+#ifdef Q_OS_WIN
+ if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA)
+#endif
QVERIFY(!bar.repainted);
#endif
+
QCOMPARE(bar.text(), QString("1 of 10 (10%)"));
bar.setRange(5, 5);
bar.setValue(5);