Liang Qi 40a1f69e86 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure.json mkspecs/macx-tvos-clang/qmake.conf mkspecs/macx-watchos-clang/qmake.conf Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c		2016-09-15 19:47:57 +02:00
..
Info.plist.app	Add support for Apple watchOS	2016-08-19 21:05:55 +00:00
Info.plist.lib	Add support for Apple watchOS	2016-08-19 21:05:55 +00:00
qmake.conf	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00
qplatformdefs.h	Add support for Apple watchOS	2016-08-19 21:05:55 +00:00