Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 15 Dec 2009 17:08:12 +0000 (18:08 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 15 Dec 2009 17:08:12 +0000 (18:08 +0100)
commit8e504f4709d15f502ca097f6bf4b27880fd9c6c5
tree19e49e1271be2b9a41e31f3a9d241ccb70da88b5
parent4896b8a5b16c7f91e026e52906c063af204c34be
parent1bbb6e4db246d7be69a7592e2e700f79d7858d5a
Merge branch '4.5' into 4.6-staging

Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
src/dbus/qdbuspendingcall.cpp
src/gui/dialogs/qfontdialog_mac.mm