Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
integrity	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
unix	consolidate generation of metafile install targets	2013-01-25 23:30:50 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
makefile.cpp	add ability to override the generated pkg-config file name	2013-02-06 14:21:44 +01:00
makefile.h	consolidate generation of metafile install targets	2013-01-25 23:30:50 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +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