Patches for Qt 5
Merge pull request #233 from yangyanli/qt5-patches

Patches for Qt 5