Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 20:14:50 +0000 (06:14 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 20:14:50 +0000 (06:14 +1000)
commit9ab069286660101e2a2a6b49587bc21a69339e77
tree672da7b873d94069fd4c8de1fa300957d737809e
parentf0b854bf5cfc6ec4715ff5f4aed3f0bd189d24ee
parent49257f86bdb090d97c387183e8f600bbb8a7eef3
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QFont/Windows: restrict the pixel size accuracy
  Update copyright year to 2011.
  For non-developer builds, skip test that requires private API
  tst_qhttpnetworkconnection: Compile fix
  Change QHostInfoCache to use QElapsedTime instead of QTime.
  Fix for qtdemo bug
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/gui/kernel/qwidget_s60.cpp
src/gui/painting/qgraphicssystem_runtime.cpp
src/gui/text/qtextobject.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
tests/auto/qtimer/tst_qtimer.cpp