Incorporated Florin's Qt5 compability changes