Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Apr 25 2016, 8:29 AM.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Committed
kfunkApr 25 2016, 8:29 AM
Differential Revision
D2701: Process QML runtime errors
Parents
R32:cd6eada155d6: Remove unused variables
R32:e296ae973279: Merge remote-tracking branch 'origin/5.0'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
cd6eada155d6apol
Remove unused variables 
Apr 21 2016
bf62036c8f4barrowd
Rework SessionLock logic so it would work without D-Bus. 
Apr 18 2016
cef2f8d1e09barrowd
Set KDE_FORK_SLAVES env var in the test shell too. 
Apr 18 2016
c5f254145778D1404cordlandwehr
Use complete include subpath. 
Apr 15 2016