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
..
default_post.prf	iOS: Don't mangle QT_ARCH when being more specific about what arch to build	2013-04-16 09:01:32 +02:00
default_pre.prf	Cache Xcode and SDK settings in .qmake.cache if it exists	2013-05-08 14:07:41 +02:00