Merge branch 'Plasma/5.12'

Authored by jgrulich on Mar 5 2018, 6:11 AM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
0267a6a016b3jgrulich
Use ScrollView from QtQuickControls 
Feb 23 2018
9b0e6e562504jriddell
Update version number for 5.12.2 GIT_SILENT 
Feb 20 2018
6a21b80d9cf3jriddell
Update version number for 5.12.1 GIT_SILENT 
Feb 13 2018
cdc9c59a903ebshah
Update version number for 5.12.0 GIT_SILENT 
Feb 1 2018
66c8db798abfl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 28 2018
616bdb89f7e7l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 23 2018
a2e61a3c1c29l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 22 2018