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

qglview/glvbo.h

@@ -23,6 +23,9 @@
 #include "chunkstream.h"
 
 class GLVBO
+#if QT_VERSION >= 0x050600
+			: protected QOpenGLExtraFunctions
+#endif
 {
 	friend class GLObjectBase;
 	friend QDataStream & operator <<(QDataStream & s, const GLVBO & m);
@@ -36,7 +39,7 @@ public:
 	void init();
 	void destroy();
 	bool rebuffer(bool clear_ = false);
-	void draw(GLenum type, QGLShaderProgram * prog, bool simplest = false);
+	void draw(GLenum type, __GLShaderProgram__ * prog, bool simplest = false);
 	void clear();
 
 	GLuint buffer() const {return buffer_;}