Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e |
||
|---|---|---|
| .. | ||
| json | ||
| qcborstreamreader | ||
| qcborstreamwriter | ||
| qcborvalue | ||
| qcborvalue_json | ||
| qdatastream | ||
| qtextstream | ||
| qxmlstream | ||
| serialization.pro | ||
Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e |
||
|---|---|---|
| .. | ||
| json | ||
| qcborstreamreader | ||
| qcborstreamwriter | ||
| qcborvalue | ||
| qcborvalue_json | ||
| qdatastream | ||
| qtextstream | ||
| qxmlstream | ||
| serialization.pro | ||