Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing