Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable ... Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0		2013-03-21 08:49:01 +01:00
..
integrity	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
unix	Add an initial TI linker support for the unix qmake generator	2013-03-19 18:22:48 +01:00
win32	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefile.cpp	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefile.h	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefiledeps.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00