Conflicts: src/widgets/itemviews/qabstractitemview.cpp src/widgets/itemviews/qabstractitemview_p.h Change-Id: I54589b1365103cb1749186af92aab03a49c94b64 |
||
|---|---|---|
| .. | ||
| images | ||
| .gitignore | ||
| qimage.pro | ||
| qimage.qrc | ||
| tst_qimage.cpp | ||
Conflicts: src/widgets/itemviews/qabstractitemview.cpp src/widgets/itemviews/qabstractitemview_p.h Change-Id: I54589b1365103cb1749186af92aab03a49c94b64 |
||
|---|---|---|
| .. | ||
| images | ||
| .gitignore | ||
| qimage.pro | ||
| qimage.qrc | ||
| tst_qimage.cpp | ||