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
..
drawtexture	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
lancebench	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-03 14:13:02 +01:00
qcolor	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qpainter	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-11 15:34:21 +01:00
qregion	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
qtbench	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
qtransform	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-11 15:34:21 +01:00
CMakeLists.txt	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
painting.pro	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-05 10:02:09 +02:00