Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9 |
||
|---|---|---|
| .. | ||
| inifiles | ||
| locationdialog.cpp | ||
| locationdialog.h | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| settingseditor.pro | ||
| settingstree.cpp | ||
| settingstree.h | ||
| variantdelegate.cpp | ||
| variantdelegate.h | ||