WIP: re-enabling. This still does not build Qt on RHEL6 yet.
merge in recent changes