Converted Qt4 subclasses to new API and added to build