Conflicts: doc/templates/style/style.css qtcreator.pri Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d