Merge remote branch 'origin/4.7' into 4.7
authorOlivier Goffart <ogoffart@trolltech.com>
Thu, 1 Apr 2010 08:45:34 +0000 (10:45 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Thu, 1 Apr 2010 08:45:34 +0000 (10:45 +0200)
commit603ee8b841385c04c5118650075134154aee29a7
tree690a0b4abfa9a20551aab285cbb0fef49686c917
parentd5e6111c62bc4437243fb1d6389e3af180f623d7
parent8ffd45cf6832b67960dbaa10654c4b84358fe3f9
Merge remote branch 'origin/4.7' into 4.7

Conflicts:
src/gui/text/qstatictext.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qdatetime.cpp
src/gui/text/qstatictext.cpp
src/script/api/qscriptengine.cpp
src/script/api/qscriptvalueiterator.cpp
tools/qdoc3/node.cpp