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
..
qmacstyle	QMacStyle: CC_ComboBox is now HITheme-free	2018-04-12 00:20:42 +00:00
qstyle	Fix deprecation warnings in widget autotests	2019-02-08 18:00:51 +00:00
qstyleoption	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qstylesheetstyle	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-16 09:34:50 +02:00
styles.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00