back out changes - qt 5.1ish is not compatible with clang 3.5