Implemented label printing using opengl (QPainter version ifdeffed, either one can be used)

Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6
Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/datavis3d/utils/objecthelper_p.h
index 17f2d294..73523fbf 100644
--- a/src/datavis3d/utils/objecthelper_p.h
+++ b/src/datavis3d/utils/objecthelper_p.h
@@ -47,10 +47,10 @@
 
 QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE
 
-class ObjectHelper
+class ObjectHelper: protected QOpenGLFunctions
 {
     public:
-    ObjectHelper(QOpenGLFunctions *parent, const QString &objectFile = QString());
+    ObjectHelper(const QString &objectFile = QString());
     ~ObjectHelper();
 
     void setObjectFile(const QString &objectFile);
@@ -64,8 +64,6 @@ class ObjectHelper
     GLuint indexCount();
 
     private:
-    QOpenGLFunctions *m_caller;
-
     QString m_objectFile;
 
     GLuint m_vertexbuffer;