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
..
unixmake.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00
unixmake.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
unixmake2.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00