Liang Qi 65a97fccc6 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9		2018-01-20 22:36:19 +01:00
..
inifiles	…
locationdialog.cpp	…
locationdialog.h	…
main.cpp	…
mainwindow.cpp	…
mainwindow.h	…
settingseditor.pro	…
settingstree.cpp	…
settingstree.h	…
variantdelegate.cpp	…
variantdelegate.h	…