Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdatetime.pro | ||
| tst_qdatetime.cpp | ||
| tst_qdatetime_mac.mm | ||
Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdatetime.pro | ||
| tst_qdatetime.cpp | ||
| tst_qdatetime_mac.mm | ||