Lars Knoll 9bd0323551 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e		2012-04-16 12:04:34 +02: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	qmake vc(x)project generator: fix VC++ Express detection	2012-04-12 04:15:05 +02: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	qmake vcxproj generator: properly escape XML attributes	2012-04-05 17:48:15 +02:00
xmloutput.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00