Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62		2013-05-23 21:27:07 +02:00
..
generators	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
library	update size calculations for assignment statements	2013-05-20 15:20:26 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
Makefile.unix	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
Makefile.win32	Unify win32-g++ and Unix qmake Makefiles.	2013-02-19 10:35:06 +01:00
meta.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
meta.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
option.cpp	make sure qmake finds itself in CWD on windows	2013-04-26 12:08:24 +02:00
option.h	remove unused member Option::application_argv0	2013-03-01 11:07:19 +01:00
project.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
project.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
property.cpp	install host libraries into -hostprefix	2013-05-13 21:54:40 +02:00
property.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake.pri	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
qmake.pro	port qmake to qt creator's qmake language evaluator	2012-09-11 00:13:01 +02:00