Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Mon, 12 Apr 2010 15:39:28 +0000 (17:39 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Mon, 12 Apr 2010 15:39:28 +0000 (17:39 +0200)
commit3723f30a91eda1c1b247598913cfc02b001a02c9
tree234241d0d6dbbf29857c4e66d2723f77239f31ee
parent6f736694461edc25b6e757f40ab9cad6a9207ad4
parent957f36cb498657f94f1b5b92f52713254ff8c051
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
20 files changed:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
src/corelib/codecs/qtextcodec.cpp
src/corelib/codecs/qtextcodec.h
src/corelib/kernel/qcoreapplication.cpp
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/image/qimage.cpp
src/gui/itemviews/qtableview.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qtextcontrol.cpp
src/gui/widgets/qmenu.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
src/openvg/qwindowsurface_vgegl.cpp
tests/auto/qfile/tst_qfile.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp