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

qglview/qglview.h

@@ -22,8 +22,6 @@
 #include "glframebuffer.h"
 #include <QGraphicsProxyWidget>
 #include <QGraphicsView>
-#include <QGLWidget>
-#include <QGLShaderProgram>
 #include <QGLFramebufferObject>
 #include <QVector3D>
 #include <QTimer>
@@ -39,6 +37,9 @@
 
 
 class QGLView: public QGraphicsView, public QGLViewBase
+#if QT_VERSION >= 0x050600
+														, protected QOpenGLExtraFunctions
+#endif
 {
 	friend class GLRendererBase;
 	Q_OBJECT
@@ -119,8 +120,12 @@ public:
 	GLRendererBase * renderer() {return renderer_;}
 	void setRenderer(GLRendererBase * r, GLRendererBase ** prev = 0) {if (prev != 0) *prev = renderer_; renderer_ = r;}
 
-	const QGLContext * context() const {return ((const QGLWidget * )viewport())->context();}
-	void makeCurrent() {((QGLWidget * )viewport())->makeCurrent();}
+#if QT_VERSION >= 0x050600
+	__GLContext__ * context() {return ((__GLWidget__ * )viewport())->context();}
+#else
+	const __GLContext__ * context() const {return ((const __GLWidget__ * )viewport())->context();}
+#endif
+	void makeCurrent() {((__GLWidget__ * )viewport())->makeCurrent();}
 
 	QColor backColor() const {return backColor_;}
 	double lineWidth() const {return lineWidth_;}
@@ -197,7 +202,7 @@ public:
 	void selectObject(GLObjectBase * o);
 
 	GLdouble aspect, iaspect;
-	//QGLShaderProgram * shader_rope;
+	//__GLShaderProgram__ * shader_rope;
 
 protected:
 	virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -253,7 +258,7 @@ private:
 	//LightingMode lmode;
 	GLObjectBase * sel_obj, * hov_obj;
 	GLFramebuffer fbo_selection;
-	QGLShaderProgram * shader_select, * shader_halo;
+	__GLShaderProgram__ * shader_select, * shader_halo;
 	GLRendererBase * renderer_;
 	SelectionMode sel_mode;
 	Qt::MouseButton sel_button;