Merge remote-tracking branch 'gerrit/master' into containers
authorJoão Abecasis <joao.abecasis@nokia.com>
Sun, 5 Feb 2012 20:25:31 +0000 (21:25 +0100)
committerJoão Abecasis <joao.abecasis@nokia.com>
Sun, 5 Feb 2012 20:26:33 +0000 (21:26 +0100)
commitd065dfd454890c332482a6109ed34a989e50809b
tree0d3e9c5367c1fad7d089d368182374e8d1d46ca1
parent632840cb0f5ad355d87fc040b015d04af86371ec
parent9f54846d951838361f4188b423e7aa7c7b9a9540
Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
src/corelib/tools/qstring.cpp

Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
21 files changed:
src/corelib/tools/qbytearray.cpp
src/corelib/tools/qbytearray.h
src/corelib/tools/qhash.cpp
src/corelib/tools/qhash.h
src/corelib/tools/qlinkedlist.cpp
src/corelib/tools/qlinkedlist.h
src/corelib/tools/qlist.cpp
src/corelib/tools/qlist.h
src/corelib/tools/qmap.cpp
src/corelib/tools/qmap.h
src/corelib/tools/qrefcount.h
src/corelib/tools/qstring.cpp
src/corelib/tools/qstring.h
src/corelib/tools/qstringbuilder.h
src/corelib/tools/qvector.cpp
src/corelib/tools/qvector.h
src/corelib/tools/tools.pri
tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
tests/auto/corelib/tools/qstring/tst_qstring.cpp
tests/auto/corelib/tools/qvector/tst_qvector.cpp
tests/benchmarks/corelib/tools/qvector/qrawvector.h