Merge remote branch 'mainline/4.8'
authorCasper van Donderen <casper.vandonderen@nokia.com>
Wed, 31 Aug 2011 08:22:19 +0000 (10:22 +0200)
committerCasper van Donderen <casper.vandonderen@nokia.com>
Wed, 31 Aug 2011 08:22:19 +0000 (10:22 +0200)
commite8d827da1567aa15a88f0041ca28b126a7ccdf52
treed52b73e4cde7c9f45f0fb417d97723258ff7da14
parent214a26fbde1c5600a10db59217ae9b63a46bce9e
parent1e48d40597bbe12321a5a3e42b3595dc17a7f8e7
Merge remote branch 'mainline/4.8'

Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
src/corelib/tools/qdatetime.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp