Qt Forward Merge Bot 0a4e5bb265 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/widgets/kernel/qshortcut.cpp tests/auto/network/access/spdy/tst_spdy.cpp Change-Id: If76c434beac2c0a393440aa365f89f77439774ce		2020-01-16 11:20:42 +01:00
..
access	Merge remote-tracking branch 'origin/5.15' into dev	2020-01-16 11:20:42 +01:00
kernel	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
socket	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-01-15 01:00:39 +01:00
ssl	Skip instead of fail tests when test server is not available	2020-01-14 00:15:16 +01:00
network.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00