Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9 |
||
|---|---|---|
| .. | ||
| bearer | ||
| doc/snippets/code | ||
| generic | ||
| imageformats | ||
| platforminputcontexts | ||
| platforms | ||
| platformthemes | ||
| printsupport | ||
| sqldrivers | ||
| styles | ||
| plugins.pro | ||