Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||
Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||