Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79 |
||
|---|---|---|
| .. | ||
| bom.json | ||
| json.pro | ||
| json.qrc | ||
| test.bjson | ||
| test.json | ||
| test2.json | ||
| test3.json | ||
| tst_qtjson.cpp | ||