Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
commitf9c434cd70663db2d1b1c32c8b68ae3ff85d6803
authorSimon Hausmann <simon.hausmann@nokia.com>
Mon, 30 Mar 2009 14:59:03 +0000 (30 16:59 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Mon, 30 Mar 2009 14:59:03 +0000 (30 16:59 +0200)
tree32ba957e42491ae7634c6a8999485a43e5f68f42
parente20d18f1982dde2b0fa9bd262e5aadd1e451a7fa
parent097b3b3323ab6641c17318057e100543b60bca77
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
src/corelib/global/qfeatures.txt
src/gui/gui.pro
src/gui/styles/qmacstyle_mac.mm