Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 14 Jan 2010 09:51:07 +0000 (10:51 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 14 Jan 2010 09:51:07 +0000 (10:51 +0100)
commitd8cadc2c9333f5b797fab87c1aa9fc9952603935
tree859201f9ec18ca1e73b22f418afec78ec6b353c3
parentf17aeadf56818e5f20e20eb91450e66adb88c99b
parentcf74ef2ca9163ac6e15b6a218ef284f6104cdcab
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix rules for recreating the Makefile in a subdir
  Disable some tests that require high floating point precision.
  Replace the truncate function with fuzzierCompare().
  Rework how Qt handles GL extensions.
  More changelog additions for QtWebKit
  Make compile on symbian/Linux
  Removed pointless image comparison in raster colorize filter.
  Improved performance of translating device coordinate graphics effects.