Liang Qi dfc177e3a9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: qmake/library/qmakeevaluator.cpp (cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools) src/corelib/kernel/qcore_mac_objc.mm src/gui/painting/qcolor.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31		2016-10-13 09:49:38 +02:00
..
unsupported	Add tool to namespace Objective-C classes at link time	2016-01-29 14:41:21 +00:00
asset_catalogs.prf	Add the ability for qmake to build Xcode asset catalogs	2016-09-28 17:58:54 +00:00
default_post.prf	Share the multi-arch infrastructure between UIKit and macOS	2016-09-29 21:51:18 +00:00
default_pre.prf	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-06 20:12:27 +02:00
objective_c.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
rez.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
sdk.prf	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00