Qt5 compatibility.
Merge branch 'v1.1'