Pushing a "quick" fix to the mac constants problem....

Quick fix because I'm including gl3.h and it's conflicting with gl.h
(just warnings…)
Merge branch 'Qt-Integration'