Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||
Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||