Merge remote-tracking branch 'qt/4.8'
authorSami Lempinen <sami.lempinen@nokia.com>
Mon, 23 May 2011 06:56:03 +0000 (09:56 +0300)
committerSami Lempinen <sami.lempinen@nokia.com>
Mon, 23 May 2011 06:56:03 +0000 (09:56 +0300)
commit4c7a61b1bad89b3d241175451869fcdcc99ef501
tree6aae9312f306d9c8428da16d76928edf48b61c93
parentc50519034230005e30ce96be45251c19adabbbd1
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
Merge remote-tracking branch 'qt/4.8'

Conflicts:
src/plugins/s60/src/qcoreapplication_3_1.cpp
src/plugins/s60/src/qcoreapplication_3_2.cpp
src/plugins/s60/src/qdesktopservices_3_1.cpp
src/plugins/s60/src/qdesktopservices_3_2.cpp
src/plugins/s60/src/qlocale_3_1.cpp
src/plugins/s60/src/qlocale_3_2.cpp
src/corelib/kernel/qcore_symbian_p.cpp
src/corelib/kernel/qcore_symbian_p.h
src/corelib/kernel/qcoreapplication.cpp
src/corelib/tools/qlocale.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/gui/util/qdesktopservices_s60.cpp
src/plugins/plugins.pro
tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp