summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qlevelofdetail.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-12-13 10:46:43 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-12-13 10:47:04 +0100
commitbfb58a7fff934fde6f4c2b4c989f411b43aee8d9 (patch)
tree432201a0c7fb6c49d7835f728fc0da97d8742b39 /src/render/frontend/qlevelofdetail.h
parentf660c657092811e77aa0ffb8145d6b060464292c (diff)
parentd69e2c2b42719e6839f32e8ab796cf22d9f29bfa (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Diffstat (limited to 'src/render/frontend/qlevelofdetail.h')
-rw-r--r--src/render/frontend/qlevelofdetail.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h
index 14ed92628..24d5942ab 100644
--- a/src/render/frontend/qlevelofdetail.h
+++ b/src/render/frontend/qlevelofdetail.h
@@ -78,7 +78,7 @@ public:
QVector<qreal> thresholds() const;
QLevelOfDetailBoundingSphere volumeOverride() const;
- Q_INVOKABLE QLevelOfDetailBoundingSphere createBoundingSphere(const QVector3D &center, float radius);
+ Q_INVOKABLE Qt3DRender::QLevelOfDetailBoundingSphere createBoundingSphere(const QVector3D &center, float radius);
public Q_SLOTS:
void setCamera(QCamera *camera);