Merge remote-tracking branch 'gerrit/master' into containers
authorJoão Abecasis <joao.abecasis@nokia.com>
Tue, 21 Feb 2012 13:58:57 +0000 (14:58 +0100)
committerJoão Abecasis <joao.abecasis@nokia.com>
Tue, 21 Feb 2012 13:58:57 +0000 (14:58 +0100)
commit31a0358afb4fde998d1eeeaa80fc32e4420266c7
tree938455353474196c1f49b0529b5b644e19c21f3e
parent4c8a4058c359c8d163c643120426079fc80c8214
parent69da8588d41bbf5ab785f5ad7c1fce76deefc7d0
Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
src/corelib/tools/qbytearray.h

Change-Id: I03b1f3e05c9b7a45130887c522fcd9b7aa387129
dist/changes-5.0.0
src/corelib/tools/qbytearray.h
src/corelib/tools/qstring.cpp
src/corelib/tools/qvector.h
tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
tests/auto/corelib/tools/qstring/tst_qstring.cpp