Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Wed, 31 Aug 2011 11:54:04 +0000 (13:54 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Wed, 31 Aug 2011 11:54:04 +0000 (13:54 +0200)
commit9f51c31a0f492c20e6d882b2ae1e036b29c2755c
treecbb3beed71735514632b4f2788b63e72667cfc04
parent0e10b8dbb7d84694cbdeb57bf42df52b12d79f47
parent4f933036a0ecbc6e6174b312ec2fd6078cea5b70
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7

Conflicts:
src/network/ssl/qsslcertificate.cpp
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qt_s60_p.h
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/node.cpp