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
..
testhelper	Merge remote-tracking branch 'origin/5.15' into dev	2020-05-04 17:38:40 +02:00
CMakeLists.txt	Post merge fixes	2019-11-25 14:53:27 +00:00
qcommandlineparser.pro
tst_qcommandlineparser.cpp	QCommandLineParser: Wrap very long option names to leave room for descriptions	2020-05-01 10:53:55 +02:00
tst_qcommandlineparser.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00