Liang Qi 5d5c00c676 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e		2018-12-04 09:58:43 +01:00
..
syslocaleapp	Updated license headers	2016-01-21 18:55:18 +00:00
test	Make tests compile for Android	2018-06-25 08:01:19 +00:00
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
BLACKLIST	Blacklist two tests on macOS that a planned CI change shall break	2018-08-24 17:30:01 +00:00
qlocale.pro	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tst_qlocale.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2018-12-04 09:58:43 +01:00