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
..
.gitignore	Move QtConcurrent into its own module	2012-02-05 17:49:16 +01:00
qthreadpool.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qthreadpool.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00