fixes for Qt 5
update
Merge branch 'master' of github.com:qcad/qcad

Conflicts:
	.gitignore