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
..
functional	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
qgraphicsanchorlayout	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
qgraphicsitem	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
qgraphicslayout	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
qgraphicslinearlayout	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
qgraphicsscene	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
qgraphicsview	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
qgraphicswidget	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
CMakeLists.txt	Convert remaining tests/benchmarks	2019-11-04 15:48:51 +00:00
graphicsview.pro	Benchmarks/QGraphicsView: re-enable graphicslayout/graphicslinearlayout	2018-04-04 06:54:39 +00:00