Make razor-config-fileassociations compile with qt 4.6
Merge remote-tracking branch 'upstream/master'