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
..
Info.plist.app	macx-xcode: Use correct replacement key for bundle identifier	2013-07-02 13:32:13 +02:00
Info.plist.lib	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qmake.conf	Refer to Apple products by their actual names.	2013-07-10 17:32:48 +02:00
qplatformdefs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00