João Abecasis 31a0358afb Merge remote-tracking branch 'gerrit/master' into containers ... Conflicts: src/corelib/tools/qbytearray.h Change-Id: I03b1f3e05c9b7a45130887c522fcd9b7aa387129		2012-02-21 14:58:57 +01:00
..
codecs	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
io	Replace Q_WS_WINCE against Q_OS_WINCE.	2012-02-09 10:45:38 +01:00
json	tests: do not run benchmarks by default in 'make check'	2012-02-02 09:27:25 +01:00
kernel	Use static-less QMetaType API in QVariant.	2012-02-16 02:00:30 +01:00
plugin	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
thread	Remove Symbian specific code from qtbase.	2012-01-31 07:08:31 +01:00
tools	Merge remote-tracking branch 'gerrit/master' into containers	2012-02-21 14:58:57 +01:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00