COMP: Correct Windows type conversions for strings.
Merge branch 'bug-17529-Upgrade-qtsingleapplication'

* bug-17529-Upgrade-qtsingleapplication:
  COMP: Correct Windows type conversions for strings.