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 |
||
|---|---|---|
| .. | ||
| qabstracttextdocumentlayout | ||
| qcssparser | ||
| qfont | ||
| qfontcache | ||
| qfontdatabase | ||
| qfontmetrics | ||
| qglyphrun | ||
| qinputcontrol | ||
| qrawfont | ||
| qstatictext | ||
| qsyntaxhighlighter | ||
| qtextblock | ||
| qtextcursor | ||
| qtextdocument | ||
| qtextdocumentfragment | ||
| qtextdocumentlayout | ||
| qtextformat | ||
| qtextlayout | ||
| qtextlist | ||
| qtextobject | ||
| qtextodfwriter | ||
| qtextpiecetable | ||
| qtextscriptengine | ||
| qtexttable | ||
| qzip | ||
| text.pro | ||