Merge pull request #793 from jemc/master

Problem: Build system for qt-android is out of date.