Qt Forward Merge Bot 0f7987f0c9 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/text/qlocale.cpp src/network/access/qnetworkaccessmanager.cpp Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01		2020-05-04 17:38:40 +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-05-04 17:38:40 +02:00
dbus	Fix autotests after the QHash changes	2020-04-09 20:04:15 +02:00
gui	Fix QTextDocumentLayout test with certain fonts	2020-05-04 08:00:37 +02:00
guiapplauncher	Fix path to examples part of tst_GuiAppLauncher	2015-02-13 07:28:15 +00:00
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	tst_Gestures: fix -Wdangling-else GCC warning	2020-04-29 08:10:36 +00: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	Merge remote-tracking branch 'origin/5.15' into dev	2020-05-04 17:38:40 +02:00
tools	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
widgets	tst_QDialogButtonBox: Port away from QAbstractButton::animateClick()	2020-04-29 10:10:37 +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