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
..
access	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-13 09:46:17 +02:00
bearer	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00
kernel	Merge remote-tracking branch 'origin/5.13' into dev	2019-07-30 13:47:36 +02:00
socket	Remove the remaining usages of deprecated APIs of qtbase	2019-08-01 06:48:27 +02:00
ssl	Make network tests build and pass with disabled deprecated APIs	2019-07-23 18:48:17 +00:00
network.pro