Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Apr 2011 23:38:13 +0000 (09:38 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Apr 2011 23:38:13 +0000 (09:38 +1000)
commit4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc
treedd58ad45196b2e8bead2fd6bfe635fb9643942ca
parent46082389f2a700a1f98826e0c575ab4e31059761
parentc4015c6a6ea663829b13596ebbbbcea3d9acb71f
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Avoid compilation warnings on Symbian
  Get rid of double conversions and arithmetic when qreal is float.
src/gui/painting/qbrush.cpp