windows build fix
also, fix for default icon not showing
Merge pull request #1315 from qreal/windows-build-fix

Windows build fix