Merge remote-tracking branch 'origin/5.2'

Authored by kfunk on Oct 9 2017, 9:26 AM.

Description

Merge remote-tracking branch 'origin/5.2'

Details

Merged Changes

CommitAuthorDetailsCommitted
5c95479cee5akfunk
Fully restore compat with Qt 5.5 
Oct 9 2017
fd60b4b6dee8kfunk
Another compile fix for Qt 5.5 
Oct 8 2017