Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9 |
||
|---|---|---|
| .. | ||
| fetchmore.pro | ||
| filelistmodel.cpp | ||
| filelistmodel.h | ||
| main.cpp | ||
| window.cpp | ||
| window.h | ||
Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9 |
||
|---|---|---|
| .. | ||
| fetchmore.pro | ||
| filelistmodel.cpp | ||
| filelistmodel.h | ||
| main.cpp | ||
| window.cpp | ||
| window.h | ||