João Abecasis 79f2480c86 Merge remote-tracking branch 'origin/api_changes' into containters ... Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6		2012-03-08 12:02:41 +01:00
..
codecs	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
io	clean up qmake-generated projects	2012-02-24 05:18:30 +01:00
json	tests: do not run benchmarks by default in 'make check'	2012-02-02 09:27:25 +01:00
kernel	Merge remote-tracking branch 'origin/api_changes' into containters	2012-03-08 12:02:41 +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 'origin/api_changes' into containters	2012-03-08 12:02:41 +01:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00