git-svn-id: svn://db.shs.com.ru/libs@286 a8b55f48-bf90-11e4-a774-851b48703e85

2017-10-03 12:20:32 +00:00
parent b46b9329f3
commit 7ad19d72c5
40 changed files with 320 additions and 712 deletions
--- a/qglview/glframebuffer.h
+++ b/qglview/glframebuffer.h
@@ -22,6 +22,9 @@
 #include "gltypes.h"

 class GLFramebuffer
+#if QT_VERSION >= 0x050600
+					: protected QOpenGLExtraFunctions
+#endif
 {
 public:
 	GLFramebuffer(int colorAttachments = 1, bool withDepth = true, GLenum colorFormat = GL_RGBA8, GLenum target = GL_TEXTURE_2D);