Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 14 Apr 2010 08:14:40 +0000 (10:14 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 14 Apr 2010 08:14:40 +0000 (10:14 +0200)
commit62cd360b3f2ef9e9787359a9105fd805b721b49f
tree8bb7dd87f0914d59d94d688c32e9244ebb79cbad
parent4af9cc043370846c52ec21cf874696ee650394c1
parent0dbd8f1b0a6df20e5502bb35e58490a9f99953a7
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/script/api/qscriptengine.cpp
doc/src/platforms/platform-notes.qdoc
qmake/generators/symbian/symmake_sbsv2.cpp
qmake/qmake.pri
src/gui/styles/qs60style_s60.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/ssl/qsslsocket_openssl_symbols.cpp
src/script/api/qscriptengine.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp