Conflicts: src/corelib/global/qlogging.cpp src/gui/painting/qtextureglyphcache_p.h src/gui/text/qfontengine.cpp src/widgets/widgets/qlineedit.cpp Change-Id: Ic8798538df466b7141caa8bbf1fb7605eb56be37 |
||
|---|---|---|
| .. | ||
| bearer | ||
| doc/snippets/code | ||
| generic | ||
| imageformats | ||
| platforminputcontexts | ||
| platforms | ||
| platformthemes | ||
| printsupport | ||
| sqldrivers | ||
| styles | ||
| plugins.pro | ||