Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 17 Sep 2009 07:05:18 +0000 (09:05 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Thu, 17 Sep 2009 07:05:18 +0000 (09:05 +0200)
commitdfcf988a3f0c88f96e202482e5d363d880b9d6d2
tree42ee9ccb99945e64956abc7d1a6f1259e10a006e
parent4bf2d055aa31a7d2768538368d2984a3d594650e
parent18c0fec3afba909faa341c766f31d679892021db
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qtwidgets/tst_qtwidgets.cpp
src/gui/painting/qpainter.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qkeysequence/tst_qkeysequence.cpp
tests/auto/qsqlquery/tst_qsqlquery.cpp