Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4 |
||
|---|---|---|
| .. | ||
| invalidBinaryData | ||
| bom.json | ||
| json.pro | ||
| json.qrc | ||
| test.bjson | ||
| test.json | ||
| test2.json | ||
| test3.json | ||
| tst_qtjson.cpp | ||