Merge pull request #67 from linuxqc/master
To make building successfull wi Desktop Qt 5.4.0 MSVC2012 OpenGL 32bit