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
..
benchapps	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
chiptester	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
images	Benchmark: move widgets benchmarks still in gui subdirectory to widgets	2018-03-27 16:50:44 +00:00
CMakeLists.txt	Regenerate qtbase tests and src/* for some small fixes	2019-11-13 13:36:09 +00:00
qgraphicsview.pro	Benchmark: move widgets benchmarks still in gui subdirectory to widgets	2018-03-27 16:50:44 +00:00
qgraphicsview.qrc	Benchmark: move widgets benchmarks still in gui subdirectory to widgets	2018-03-27 16:50:44 +00:00
random.data	Benchmark: move widgets benchmarks still in gui subdirectory to widgets	2018-03-27 16:50:44 +00:00
tst_qgraphicsview.cpp	Remove deprecated members from graphics view classes	2020-04-16 16:53:33 +02:00