Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
authorJason McDonald <jason.mcdonald@nokia.com>
Mon, 24 Aug 2009 06:03:27 +0000 (16:03 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Mon, 24 Aug 2009 06:03:27 +0000 (16:03 +1000)
commitf8fabc79d74b3043ca524b6376d662f46b4a7f2e
treef4c9b40988d55ca64950626e6e63f8fd644d20ed
parent232fa760b0fb304116f0d17c3e7c25fdcea3d6bf
parentede5f8cb8ae1fcc7631cc05e9c57c0cfa5790ef5
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

Conflicts:
demos/embedded/fluidlauncher/pictureflow.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
tests/auto/moc/os9-newlines.h
tests/auto/qsqldatabase/tst_databases.h
tools/xmlpatterns/main.h
tools/xmlpatterns/qcoloringmessagehandler_p.h
tools/xmlpatterns/qcoloroutput.cpp
tools/xmlpatterns/qcoloroutput_p.h