e62d04b933
Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52 |
||
---|---|---|
.. | ||
qcalendar | ||
qdate | ||
qdatetime | ||
qtime | ||
qtimezone | ||
time.pro |
e62d04b933
Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52 |
||
---|---|---|
.. | ||
qcalendar | ||
qdate | ||
qdatetime | ||
qtime | ||
qtimezone | ||
time.pro |