Merge remote-tracking branch 'origin/4.8'
authorOlivier Goffart <olivier.goffart@nokia.com>
Tue, 24 May 2011 13:29:17 +0000 (15:29 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 24 May 2011 13:29:17 +0000 (15:29 +0200)
commit06d32b235a21fb612972d248089805423a97bc18
tree2fa2c5045322ec7e1677d2f5a4d45e2df565b19a
parent9face4b88de2db6f552149d2f96257620e971a59
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
Merge remote-tracking branch 'origin/4.8'
27 files changed:
src/corelib/concurrent/qtconcurrentcompilertest.h
src/corelib/concurrent/qtconcurrentfunctionwrappers.h
src/corelib/concurrent/qtconcurrentrun.h
src/corelib/concurrent/qtconcurrentstoredfunctioncall.h
src/corelib/global/qendian.h
src/corelib/global/qglobal.h
src/corelib/io/qurl.cpp
src/corelib/io/qurl.h
src/corelib/plugin/quuid.cpp
src/corelib/plugin/quuid.h
src/corelib/tools/qlocale.cpp
src/gui/kernel/qdnd_x11.cpp
src/network/access/qnetworkcookiejar.cpp
src/network/access/qnetworkcookiejar_p.h
src/network/ssl/qsslcertificate.cpp
src/network/ssl/qsslsocket_openssl_symbols.cpp
src/network/ssl/qsslsocket_openssl_symbols_p.h
tests/auto/qhostinfo/tst_qhostinfo.cpp
tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
tests/auto/qsslcertificate/certificates/gencertificates.sh
tests/auto/qsslcertificate/tst_qsslcertificate.cpp
tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
tests/auto/qurl/tst_qurl.cpp
tests/auto/quuid/tst_quuid.cpp
tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
util/corelib/qurl-generateTLDs/main.cpp