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
..
.gitignore
BLACKLIST	Update for failures only on dev branch. Use general platform names	2019-08-19 18:22:11 +02:00
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qsocketnotifier.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
tst_qsocketnotifier.cpp	Introduce QSocketNotifier::activate(QSocketDescriptor, QSN::Type)	2020-04-16 13:52:11 +02:00