Liang Qi 980567b3a3 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9		2019-01-26 08:35:40 +01:00
..
qmacstyle	QMacStyle: CC_ComboBox is now HITheme-free	2018-04-12 00:20:42 +00:00
qstyle	winrt: Make widgets/styles auto tests pass	2018-05-25 11:02:21 +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 dev	2019-01-26 08:35:40 +01:00
styles.pro	…