Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52 |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| qtimezone.pro | ||
| tst_qtimezone.cpp | ||
| tst_qtimezone_darwin.mm | ||
Conflicts: src/corelib/serialization/qcborvalue.cpp Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52 |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| qtimezone.pro | ||
| tst_qtimezone.cpp | ||
| tst_qtimezone_darwin.mm | ||