Merge remote branch 'origin/4.7' into 4.8-from-4.7
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 1 Jun 2011 22:55:19 +0000 (08:55 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 1 Jun 2011 22:55:19 +0000 (08:55 +1000)
commit0548b4f69d95dbd992cf60c8ab0f1225523b15e1
treea3669b4d755cc1721681e424513ec7801146b2b3
parent73fc68802d8c0c8d3d499b279782ce270f1c5bc6
parente9ab8493053a7dd56cde058e736f46feafb378d0
Merge remote branch 'origin/4.7' into 4.8-from-4.7

Conflicts:
src/declarative/declarative.pro
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
src/declarative/declarative.pro
src/declarative/qml/qperformancetimer.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/ssl/qsslsocket_openssl.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp