Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
|---|---|---|
| .. | ||
| bearer | ||
| generic | ||
| imageformats | ||
| platforminputcontexts | ||
| platforms | ||
| platformthemes | ||
| printsupport | ||
| sqldrivers | ||
| styles | ||
| plugins.pro | ||