Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867 |
||
|---|---|---|
| .. | ||
| socketprocess | ||
| test | ||
| .gitignore | ||
| qlocalsocket.pro | ||
| tst_qlocalsocket.cpp | ||
Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867 |
||
|---|---|---|
| .. | ||
| socketprocess | ||
| test | ||
| .gitignore | ||
| qlocalsocket.pro | ||
| tst_qlocalsocket.cpp | ||