Merge pull request #1 from lasconic/master

windows build
Update compilation with Qt5.2.1
partial fix for Linux build
Merge pull request #2 from AntonioBL/qt5

Qt5 compilation