OP-1103 Some minor cleanup work and adding a version check for Qt5.1