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
..
integrity	QByteArray: deprecate QT_NO_CAST_FROM_BYTEARRAY-protected operators	2012-02-26 09:14:11 +01:00
mac	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
unix	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
win32	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
makefile.cpp	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
makefile.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
makefiledeps.cpp	QByteArray: deprecate QT_NO_CAST_FROM_BYTEARRAY-protected operators	2012-02-26 09:14:11 +01:00
makefiledeps.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
metamakefile.cpp	make evaluation of spec+cache independent of build pass context	2012-03-02 21:33:08 +01:00
metamakefile.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
projectgenerator.cpp	get rid of Option::user_configs	2012-03-02 21:33:08 +01:00
projectgenerator.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
xmloutput.cpp	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
xmloutput.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00