1783fca897
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_readme.txt | ||
LED_REAL.TTF | ||
qfontdatabase.pro | ||
testdata.qrc | ||
tst_qfontdatabase.cpp |