Merge "Move main function out of namespace" into qt-dev