Qt Forward Merge Bot 97417e8f28 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a		2020-02-04 10:44:00 +01:00
..
syslocaleapp	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
test	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
.gitignore	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
qlocale.pro	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
tst_qlocale.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00