Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 07:51:45 +0000 (17:51 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 07:51:45 +0000 (17:51 +1000)
commitb71a43deb870352aa647c395e6bb02d9f20f50e5
treeb7283e42837539af8f979cbba14da85e729468b2
parent9cc21c043238dc7576a465c9d236e8968fd8c549
parent84658ec4e650b12dcea6f886b530e66a195465cf
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.