Merge remote-tracking branch 'upstream/4.8'
authorSergio Ahumada <sergio.ahumada@nokia.com>
Mon, 29 Aug 2011 08:51:04 +0000 (10:51 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Mon, 29 Aug 2011 08:51:04 +0000 (10:51 +0200)
commitfc87ef723d5a030fd701257eeca471e450e08fbb
treedcd380c789de4cc2b586c66277b39b8c9fc0d76f
parent87136163dcd7ffb8759875bca2b4e559a32167cd
parente154fb84b075ad3fda4ac02d620b28cc50e46c09
Merge remote-tracking branch 'upstream/4.8'

Conflicts:
tools/qdoc3/cppcodemarker.cpp
src/corelib/io/qdir.cpp
src/gui/painting/qpaintengine_raster.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp