Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
authorJanne Anttila <janne.anttila@digia.com>
Wed, 9 Sep 2009 07:53:46 +0000 (10:53 +0300)
committerJanne Anttila <janne.anttila@digia.com>
Wed, 9 Sep 2009 07:53:46 +0000 (10:53 +0300)
commitd71d5ffd356342e55f09b31f5a702926f86994eb
tree9905e5ec166f9f26de4ad6633bf41b594a4b7de7
parent85881f83c34cbb92e5d2ea61d16daef1f34fcad8
parentf7906352b21b0634745094f7bb7966d5f6941192
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
16 files changed:
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qprocess_symbian.cpp
src/corelib/kernel/qcoreapplication.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/painting/qpaintbuffer.cpp
src/gui/painting/qpainter.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/styles/qwindowsstyle.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/util/qdesktopservices_s60.cpp
src/multimedia/audio/qaudioinput.h
src/multimedia/video/qvideosurfaceformat.h
src/sql/drivers/sqlite/qsql_sqlite.cpp
src/svg/qsvghandler.cpp
src/svg/qsvgstyle.cpp