Kent Hansen 95d6f8a4cf Merge master into api_changes ... Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6		2012-03-19 10:03:48 +01:00
..
codecs	Fixed benchmarks to work from install directory	2012-03-19 01:18:20 +01:00
io	Fixed benchmarks to work from install directory	2012-03-19 01:18:20 +01:00
json	Fixed benchmarks to work from install directory	2012-03-19 01:18:20 +01:00
kernel	Merge master into api_changes	2012-03-19 10:03:48 +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 master into api_changes	2012-03-19 10:03:48 +01:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00