package with qt4
Merge branch 'v2.1.1'