Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Jun 16 2016, 9:01 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Merged Changes

CommitAuthorDetailsCommitted
f92d14c64618kfunk
Make compile with Qt 5.4 
Jun 16 2016