Liang Qi 1dade1bd8a Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/corelib/tools/qlist.h src/gui/painting/qcompositionfunctions.cpp src/gui/painting/qtriangulator_p.h src/gui/text/qfontengine_p.h src/network/kernel/qhostinfo_p.h src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798		2019-08-13 09:46:17 +02:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-13 09:46:17 +02:00
unixmake.cpp	Do not use QList<QMakeLocalFileName>	2019-08-12 08:05:14 +02:00
unixmake.h	Remove QMake's -createstub option	2019-08-03 14:48:10 +02:00