Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 8 Oct 2009 16:02:01 +0000 (18:02 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 8 Oct 2009 16:02:01 +0000 (18:02 +0200)
commit3945fd75a93d790434b33c2d23add155893a82a4
treee83166a337857381d1c152d0bb9c0f1c5d101efc
parentf7e13aefc24b98299d8fd44cad60cc13b16e4114
parentaa863c61ec5e68ff73c02e25a2954cdba9c2ef15
Merge branch '4.5' into 4.6

Conflicts:
src/gui/itemviews/qheaderview.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/kernel/qkeymapper_win.cpp
src/gui/styles/qplastiquestyle.cpp
translations/translations.pri