Switch from QGLWidget to OpenGLSurface
merge