Frederik Gladhorn 8c6755aeec Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/tools/qstring.cpp Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e		2013-09-16 14:52:40 +02:00
..
integrity	Don't compile MD4, MD5, SHA-2 and SHA-3 into qmake	2013-08-15 01:30:54 +02:00
mac	Merge remote-tracking branch 'origin/stable' into dev	2013-09-16 14:52:40 +02:00
unix	de-duplicate code for writing dummy makefiles	2013-08-27 19:12:06 +02:00
win32	qmake: added file deployment support for winrt and winphone targets	2013-09-15 18:18:46 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-09-07 16:18:32 +02:00
makefile.h	de-duplicate code for writing dummy makefiles	2013-08-27 19:12:06 +02:00
makefiledeps.cpp	remove support for Qtopia's QOM_OBJECT macro	2013-08-26 12:21:40 +02:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
projectgenerator.h	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00