diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:46:49 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:48:41 +0200 |
| commit | bc317e1ea56c85a41413a5ddde4112623a1b4913 (patch) | |
| tree | e51b2b78f81940cfc70b49953308197080cd368f /src/datavisualization/data | |
| parent | 03cbebd97354b7251e87dcde8adc6b49eba973e5 (diff) | |
| parent | 46ef32d424d7e0209e52528286e31f656c654289 (diff) | |
Merge branch 'develop'
Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
Diffstat (limited to 'src/datavisualization/data')
| -rw-r--r-- | src/datavisualization/data/labelitem.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp index ec8ba3fd..4e0e9b5c 100644 --- a/src/datavisualization/data/labelitem.cpp +++ b/src/datavisualization/data/labelitem.cpp @@ -28,7 +28,7 @@ LabelItem::LabelItem() LabelItem::~LabelItem() { - QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId); + clear(); } void LabelItem::setSize(const QSize &size) @@ -54,10 +54,9 @@ GLuint LabelItem::textureId() const void LabelItem::clear() { - if (m_textureId) { + if (m_textureId && QOpenGLContext::currentContext()) QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId); - m_textureId = 0; - } + m_textureId = 0; m_size = QSize(0, 0); } |