Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf |
||
|---|---|---|
| .. | ||
| socketprocess | ||
| test | ||
| .gitignore | ||
| qlocalsocket.pro | ||
| tst_qlocalsocket.cpp | ||