Merge remote branch 'origin/4.6' into 4.7-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 20 Jul 2010 22:51:51 +0000 (08:51 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 20 Jul 2010 22:51:51 +0000 (08:51 +1000)
commitcd986f27c78077bc6ae4132ce720d5512c9d4539
tree1564d79b358d20588eaf120b9a26d8af95512458
parent3fad4bda10083acd6cfd0cad2c939808e9b26852
parenta1a3535cd45819bd54310791bdcc1cec43f38b63
Merge remote branch 'origin/4.6' into 4.7-from-4.6

Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tools/qtestlib/chart/database.cpp
tools/qtestlib/chart/database.h
tools/qtestlib/chart/reportgenerator.cpp
tools/qtestlib/chart/reportgenerator.h
src/testlib/qtestcase.cpp