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
..
cmake	Get rid of QT_OPENGL_ES*	2020-04-17 11:50:24 +02:00
concurrent	Squash again some tests in concurrentmap	2020-04-21 10:28:06 +02:00
corelib	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
dbus	Fix autotests after the QHash changes	2020-04-09 20:04:15 +02:00
gui	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
guiapplauncher
installed_cmake
network	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-11 14:59:13 +02:00
opengl	Get rid of QT_OPENGL_ES*	2020-04-17 11:50:24 +02:00
other	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-08 20:11:39 +02:00
printsupport	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
shared	QWindowsFontDatabase: Check preferred family names for all fonts	2019-11-29 09:31:21 +01:00
sql	QSqlError: Remove deprecated methods	2020-04-06 14:25:12 +02:00
testlib	Restructure testlib selftest project	2020-03-24 21:04:43 +01:00
tools	Fix autotests after the QHash changes	2020-04-09 20:04:15 +02:00
widgets	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-22 15:28:01 +02:00
xml	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-16 18:41:27 +01:00
auto.pro	Disable tests with qemu-arm & developer-build configurations in the CI	2019-10-03 15:12:33 +00:00
CMakeLists.txt	cmake: Remove APPLE prefix from platform names	2020-03-16 17:57:56 +01:00
network-settings.h	Revert "QAbstractSocket: deprecate 'error' member-function"	2020-02-26 23:07:52 +03:00