Merge pull request #3923
cfe4cad [Qt] fix style, formating, comment and indentation problems (Philip Kaufmann)