Merge branch 'Plasma/5.18'

Authored by sitter on Mar 20 2020, 1:09 PM.

Description

Merge branch 'Plasma/5.18'

  1. Conflicts:
  2. CMakeLists.txt

Merged Changes

CommitAuthorDetailsCommitted
80efb36bc807D28098sitter
remove pointless and arbitrary 4 line frame limit 
Mar 20 2020
4c986ea51826jriddell
Update version number for 5.18.3 GIT_SILENT 
Mar 10 2020
9489b933e5bcjjazeix
fix windows compilation, QString.sprintf() is deprecated 
Mar 7 2020