Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf |
||
|---|---|---|
| .. | ||
| bearermonitor.cpp | ||
| bearermonitor.h | ||
| bearermonitor.pro | ||
| bearermonitor_240_320.ui | ||
| bearermonitor_640_480.ui | ||
| main.cpp | ||
| sessionwidget.cpp | ||
| sessionwidget.h | ||
| sessionwidget.ui | ||