Merge commit 'origin/4.5' into 4.6
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Tue, 22 Sep 2009 08:53:39 +0000 (10:53 +0200)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Tue, 22 Sep 2009 08:53:39 +0000 (10:53 +0200)
commitdef49cd0e2d256ff3c31aa80343ce52f4fd6e2e7
tree09e3aa8d6e3f72f815b1beaf6d59261b5f45acdd
parente689e41ad1baad65d90866eefe88a96f5e16fa04
parentd14fd301314bcceaf2594a5a18f6d20894c1d353
Merge commit 'origin/4.5' into 4.6

Conflicts:
src/corelib/kernel/qcoreapplication.cpp
tests/auto/windowsmobile/test/tst_windowsmobile.cpp
src/corelib/kernel/qcoreapplication.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qtextcodec/tst_qtextcodec.cpp
tests/auto/windowsmobile/test/tst_windowsmobile.cpp