Compile fixes for upstream qbs.
Compile fixes for new qbs
Merge branch 'dev'