summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/doc/qtdatavis3d.qdocconf1
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp2
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf
index c81bdf59..e8dd6070 100644
--- a/src/datavisualization/doc/qtdatavis3d.qdocconf
+++ b/src/datavisualization/doc/qtdatavis3d.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtdatavis3d.qdocconf)
project = QtDataVisualization
description = Qt Data Visualization Reference Documentation
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 3a6a524f..ab15605c 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -234,7 +234,7 @@ void Abstract3DRenderer::initializeOpenGL()
loadLabelMesh();
loadPositionMapperMesh();
- QObject::connect(m_context, &QOpenGLContext::aboutToBeDestroyed,
+ QObject::connect(m_context.data(), &QOpenGLContext::aboutToBeDestroyed,
this, &Abstract3DRenderer::contextCleanup);
}
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 5e6f10af..3d5dd059 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -262,7 +262,7 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
zoomLevel = qBound(minZoomLevel, zoomLevel, maxZoomLevel);
if (isZoomAtTargetEnabled()) {
- scene()->setGraphPositionQuery(event->pos());
+ scene()->setGraphPositionQuery(event->position().toPoint());
d_ptr->m_zoomAtTargetPending = true;
// If zoom at target is enabled, we don't want to zoom yet, as that causes
// jitter. Instead, we zoom next frame, when we apply the camera position.