Liang Qi 9d67bf6e96 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/tools/qlocale.qdoc tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13		2019-04-16 09:34:50 +02:00
..
images	StyleSheetStyle: Load @Nx images	2018-10-04 07:01:05 +00:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +00:00
qstylesheetstyle.pro	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
resources.qrc	StyleSheetStyle: Load @Nx images	2018-10-04 07:01:05 +00:00
tst_qstylesheetstyle.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-16 09:34:50 +02:00