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>
Mon, 5 Jul 2010 04:48:09 +0000 (06:48 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 5 Jul 2010 04:48:09 +0000 (06:48 +0200)
commit0352f68257f67fc4d252e16b7d2f63a22bc60d4f
treec002f908f2a2ac66d20d3f45aba7d5605d656ea6
parentad910819812c100d300cfbf8f2de7cfe3105af03
parent46ff093e22f95aa5e634e7edc6484ee717054625
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:
  Include qmath.h to get the definition of ceil()