Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +02:00
..
integrity	fix license headers	2013-05-30 12:16:49 +02:00
mac	iOS: Don't mangle QT_ARCH when being more specific about what arch to build	2013-04-16 09:01:32 +02:00
unix	Android: Backslash workarounds for Unix Makefile generator	2013-04-10 17:51:36 +02:00
win32	fix PlatformToolSet tag location in vcxproj files	2013-05-30 12:49:48 +02:00
makefile.cpp	qmake: do not write timestamps to generated Makefiles	2013-04-16 17:43:44 +02:00
makefile.h	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefiledeps.cpp	Fix leak when fd != -1	2013-03-23 14:42:45 +01: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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
projectgenerator.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01: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