Merge remote branch 'mainline/4.6' into 4.6
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 13 Jan 2010 10:39:21 +0000 (11:39 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 13 Jan 2010 10:39:21 +0000 (11:39 +0100)
commit3aca005d4721b82446922310496271ebe206a0d7
treef71298b19bd98c6b3751bc9009b2fdb49c2ad526
parent6088336d9237eaa94def8c2a83901b547e682abb
parent48e08ee5718b3de855ecea626179ad5323e38fa0
Merge remote branch 'mainline/4.6' into 4.6

Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
14 files changed:
doc/src/examples/moveblocks.qdoc
examples/animation/moveblocks/main.cpp
src/gui/styles/qs60style.cpp
src/gui/styles/qs60style_p.h
src/gui/styles/qs60style_s60.cpp
src/gui/styles/qs60style_simulated.cpp
tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
tests/auto/linguist/lupdate/tst_lupdate.cpp
tools/linguist/lupdate/cpp.cpp
tools/linguist/lupdate/main.cpp
tools/linguist/lupdate/merge.cpp
tools/linguist/shared/translator.cpp
translations/qt_de.ts