Updated refs, work good with qt5/qt4, unit tests pass on Qt5 desktop