Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Fri, 6 May 2011 08:07:16 +0000 (10:07 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Fri, 6 May 2011 08:07:39 +0000 (10:07 +0200)
commit4b35a36ca088a79c1aac877d3259e8a981399ee9
treefc233cc0f2aa9e6de91b9d95037d218327cc0cc9
parent1d9a18142eb19d5dde93b7e5c63f9be0e4caf896
parent718013958724210915b24142c499154f751f0bac
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/painting/qpainterpath.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/eabi/QtGuiu.def
19 files changed:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qmetaobjectbuilder.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qhttpsocketengine.cpp
src/network/ssl/qsslsocket.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qwidget/tst_qwidget.cpp