Oswald Buddenhagen 76c0be34cd Merge branch 'dev' into stable ... This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b		2013-03-20 13:49:28 +01:00
..
integrity	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
unix	Add an initial TI linker support for the unix qmake generator	2013-03-19 18:22:48 +01:00
win32	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
makefile.cpp	Make .prl file generation work for iOS again.	2013-03-06 19:03:21 +01:00
makefile.h	Make .prl file generation work for iOS again.	2013-03-06 19:03:21 +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	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +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