Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8 |
||
|---|---|---|
| .. | ||
| doc | ||
| dom | ||
| sax | ||
| qtxmlglobal.h | ||
| xml.pro | ||
Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8 |
||
|---|---|---|
| .. | ||
| doc | ||
| dom | ||
| sax | ||
| qtxmlglobal.h | ||
| xml.pro | ||