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
..
integrity	QByteArray: deprecate QT_NO_CAST_FROM_BYTEARRAY-protected operators	2012-02-26 09:14:11 +01:00
mac	Build qmake with QStringBuilder.	2012-03-16 23:02:15 +01:00
unix	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
win32	remove support for QMAKE_PLATFORM_DIR	2012-03-08 23:52:34 +01:00
makefile.cpp	remove support for QMAKE_PLATFORM_DIR	2012-03-08 23:52:34 +01:00
makefile.h	remove support for QMAKE_PLATFORM_DIR	2012-03-08 23:52:34 +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	allow the unix generator to run in windows host mode	2012-03-16 18:12:41 +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