summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/abstractobjecthelper_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-27 09:30:26 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-27 09:43:51 +0300
commit15a088a1b4d63df74b547a9b7d5d4d1fb311ec29 (patch)
treea302a5b15d5b28a8159344d8de3ddb9bc8952f11 /src/datavisualization/utils/abstractobjecthelper_p.h
parent0d822bc5de5735b40fc0c76e366365ce1b6cab87 (diff)
Fix build issue with Qt 5.2.1
QImage is not a QObject, and therefore QImage::Format doesn't seem to be a supported type for a Q_PROPERTY, either. At least this was the case in Qt 5.2.1. In Qt 5.3.1 this worked. In any case, worked around the issue by removing textureFormat as a property. This shouldn't be an issue, since texture cannot meaningfully be manipulated from QML anyway. Also fixed some compile warnings. Change-Id: I257c1502d3340c49c24085fb8bf2e6176d875215 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils/abstractobjecthelper_p.h')
-rw-r--r--src/datavisualization/utils/abstractobjecthelper_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index b12bc474..99f85dab 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -38,7 +38,7 @@ class AbstractObjectHelper: protected QOpenGLFunctions
protected:
AbstractObjectHelper();
public:
- ~AbstractObjectHelper();
+ virtual ~AbstractObjectHelper();
GLuint vertexBuf();
GLuint normalBuf();