Updated sources with support for Qt4 from old branch