gitorious.org Git - qt:qt.git/commit

author	Qt Continuous Integration System <qt-info@nokia.com>
	Mon, 10 Jan 2011 20:14:50 +0000 (06:14 +1000)
committer	Qt Continuous Integration System <qt-info@nokia.com>
	Mon, 10 Jan 2011 20:14:50 +0000 (06:14 +1000)
commit	9ab069286660101e2a2a6b49587bc21a69339e77
tree	672da7b873d94069fd4c8de1fa300957d737809e	tree \| snapshot
parent	f0b854bf5cfc6ec4715ff5f4aed3f0bd189d24ee	commit \| diff
parent	49257f86bdb090d97c387183e8f600bbb8a7eef3	commit \| diff

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

6b46b7419a5aee9bd5fce67b7bfa8afe8e

RSS Atom

src/corelib/kernel/qeventdispatcher_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystem_runtime.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextobject.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtimer/tst_qtimer.cpp	diff1 \|	diff2 \|	blob \| history