Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits)
  Updated DEF files for QtOpenGL for WINSCW and ARMV5
  Fix link error on MacOS
  Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
  Set no brush when the brush is a solid patern transparent color.
  Fixed networkselftest failing to resolve hostname
  tst_qmessagebox: fix `about' test on mac
  tst_qmessagebox: make the failure message better for detailsButtonText
  tst_qmessagebox: simulate key events more robustly
  Clear WSERV content when a native child receives an "expose"
  Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.
  Fixed several compile and deployment issues in the mmf phonon plugin.
  Fix fullscreen/Maximized dialog misplacement in Symbian
  Whitespace change
  Fix for coding conventions.
  Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
  Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
  Add Postgresql 8.x and 9 supports
  WorkerScript could starve image loading of CPU.
  More docs for FolderListModel
  Improve docs on attached properties on view delegates.
  ...

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);