Liang Qi dd90af1221 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: mkspecs/common/mac.conf mkspecs/features/configure_base.prf mkspecs/features/configure.prf mkspecs/macx-clang-32/qmake.conf mkspecs/macx-clang/qmake.conf mkspecs/macx-ios-clang/qmake.conf src/network/ssl/qsslsocket_openssl_symbols_p.h Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6		2016-06-23 14:24:55 +02:00
..
Info.plist.app	qmake: Pick up default bundle prefix from Xcode preferences	2013-10-31 12:33:55 +01:00
Info.plist.dSYM.in	qmake: Add support for separate debug info on Apple platforms.	2016-04-14 21:28:54 +00:00
Info.plist.lib	Add CFBundleIdentifier to the bundle Info.plist's	2014-11-10 16:04:12 +01:00
qmake.conf	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-23 14:24:55 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00