Merge branch 'Plasma/5.12'

Authored by ngraham on Mar 12 2018, 10:31 PM.

Description

Merge branch 'Plasma/5.12'

Details

Committed
ngrahamMar 12 2018, 10:31 PM
Parents
R134:622b94e37089: Simplify KNSTransaction creation
R134:e9ab10b977d5: Add Qt5::Xml
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
622b94e37089apol
Simplify KNSTransaction creation 
Mar 12 2018
1e4ecc8c06c9apol
Fix test 
Mar 12 2018
0aea4dc634acapol
Add a test to make sure we don't add resources with the wrong URL 
Mar 12 2018
81f801a69aaaapol
kns: Fix logic for adding screenshots 
Mar 12 2018
62f6b54326f5apol
Add debug information when the searched URI is wrong 
Mar 12 2018
91a11db2b54djriddell
Update version number for 5.12.3 GIT_SILENT 
Mar 6 2018