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
..
animation	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
image	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
kernel	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
math3d	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
painting	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
text	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-03 14:13:02 +01:00
CMakeLists.txt	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
gui.pro	Benchmark: move widgets benchmarks still in gui subdirectory to widgets	2018-03-27 16:50:44 +00:00