Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
ioutils.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
ioutils.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
proitems.cpp	fix warning in ProStringList_join	2013-05-07 15:03:11 +02:00
proitems.h	update size calculations for assignment statements	2013-05-20 15:20:26 +02:00
qmake_global.h	add missing ifdefery	2013-06-12 16:27:10 +02:00
qmakebuiltins.cpp	make stubs for dangerous/useless qmake functions in limited mode	2013-06-12 16:27:04 +02:00
qmakeevaluator_p.h	Update feature paths on assignment to QMAKE_PLATFORM	2013-02-18 17:07:17 +01:00
qmakeevaluator.cpp	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
qmakeevaluator.h	make Makefiles not depend on .qmake.super	2013-06-15 21:39:40 +02:00
qmakeglobals.cpp	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
qmakeglobals.h	don't flush qmake command line twice	2013-02-01 17:38:29 +01:00
qmakeparser.cpp	update size calculations for assignment statements	2013-05-20 15:20:26 +02:00
qmakeparser.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00