Android qt5 support and
some minor changes