Liang Qi 3e949b75fd Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/macx-ios-clang/features/resolve_config.prf qtbase.pro Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea		2016-10-01 22:15:55 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00