pre-merge commit
Merge branch 'master' of https://github.com/bcace/ochre
fixed qt version check
separated declaration & expression parse stages