Lars Knoll 96232be146 Merge remote-tracking branch 'origin/api_changes' ... Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296		2012-03-04 21:45:05 +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	clean up qmake-generated projects	2012-02-24 05:18: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 'origin/api_changes'	2012-03-04 21:45:05 +01:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00