qt5base-lts/tests/auto/widgets
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
..
dialogs Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
effects Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
graphicsview CMake: Disable two graphicsview tests 2020-03-18 15:44:06 +01:00
itemviews Remove deprecated members from QtWidgets/itemviews classes 2020-04-17 20:49:36 +02:00
kernel Remove deprecated QStyle enum values 2020-04-16 16:53:18 +02:00
styles Remove deprecated QStyle enum values 2020-04-16 16:53:18 +02:00
util Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
widgets Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
CMakeLists.txt Begin port of qtbase to CMake 2018-11-01 11:48:46 +00:00
widgets.pro