Merge branch 'Plasma/5.12' into Plasma/5.13

Authored by broulik on Jul 11 2018, 8:47 AM.

Description

Merge branch 'Plasma/5.12' into Plasma/5.13

Merged Changes

CommitAuthorDetailsCommitted
659449387eaeD14029broulik
[Kicker] Use KFilePlaces::convertedUrl for ComputerModel 
Jul 11 2018