Qt Forward Merge Bot efd7757154 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/widgets/widgets/qabstractbutton.cpp src/widgets/widgets/qbuttongroup.cpp src/widgets/widgets/qbuttongroup.h src/widgets/widgets/qsplashscreen.cpp tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp tests/benchmarks/opengl/main.cpp Needed update: src/plugins/platforms/cocoa/CMakeLists.txt Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5		2020-04-22 15:28:01 +02:00
..
access	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
kernel	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
socket	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
ssl	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
CMakeLists.txt	CMake: Handle finding of OpenSSL headers correctly	2020-04-08 22:03:24 +02:00
network.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00