Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| qcborvalue.pro | ||
| tst_qcborvalue.cpp | ||
Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| qcborvalue.pro | ||
| tst_qcborvalue.cpp | ||