289acbc cleanup, pull in latest upstream fixes, -Qt5 support

Authored and Committed by Rex Dieter 9 years ago
    cleanup, pull in latest upstream fixes, -Qt5 support
    
        
file modified
+62 -9