Merge remote-tracking branch 'qt/4.8'
authorJyri Tahtela <jyri.tahtela@nokia.com>
Thu, 19 May 2011 13:56:55 +0000 (16:56 +0300)
committerJyri Tahtela <jyri.tahtela@nokia.com>
Thu, 19 May 2011 13:56:55 +0000 (16:56 +0300)
commit94051a438e64eaede021b4e926ef58f793a09a70
tree9860dc49d8e6453df356f51da9126b583ac35206
parent06557b8d7c472c6298f7d8b310feda225864265f
parent35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5
Merge remote-tracking branch 'qt/4.8'
16 files changed:
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qbytearray.h
src/corelib/tools/qstring.cpp
src/corelib/tools/qstring.h
src/corelib/tools/qstringbuilder.h
src/network/kernel/qhostaddress.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/plugins/codecs/jp/qsjiscodec.cpp
tests/auto/q3dns/tst_q3dns.cpp
tests/auto/qhostaddress/tst_qhostaddress.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
tests/auto/qtextcodec/tst_qtextcodec.cpp