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
..
qdir	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qdiriterator	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qfile	QNX: fixed compilation of auto test	2013-06-06 13:48:06 +02:00
qfileinfo	benchmarks: Re-enable QFileInfo build by removing canonicalFileNamePerformance.	2013-07-04 17:00:17 +02:00
qiodevice	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprocess	Fix qprocess benchmark test build for WEC7.	2013-04-17 19:49:08 +02:00
qtemporaryfile	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
io.pro	benchmarks: Re-enable QFileInfo build by removing canonicalFileNamePerformance.	2013-07-04 17:00:17 +02:00