Liang Qi ef25620ac1 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/features/qpa/genericunixfontdatabase.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf src/corelib/io/qiodevice.cpp Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491		2016-10-06 20:12:27 +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	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK	2016-09-15 20:01:33 +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.7' into 5.8	2016-10-06 20:12:27 +02:00