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
..
.gitignore
BLACKLIST	tst_QItemDelegate: try to stabilize combobox test	2019-01-25 14:47:17 +00:00
qitemdelegate.pro	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
tst_qitemdelegate.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-26 08:35:40 +01:00