Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I539d8cae5fd413b8a6c9c5d8a6364c79c8133a0a |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||
Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I539d8cae5fd413b8a6c9c5d8a6364c79c8133a0a |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||