Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| LED_REAL.TTF | ||
| LED_REAL_readme.txt | ||
| qfontdatabase.pro | ||
| testdata.qrc | ||
| tst_qfontdatabase.cpp | ||