Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867 |
||
|---|---|---|
| .. | ||
| findfiles.pro | ||
| main.cpp | ||
| window.cpp | ||
| window.h | ||
Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867 |
||
|---|---|---|
| .. | ||
| findfiles.pro | ||
| main.cpp | ||
| window.cpp | ||
| window.h | ||