diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-09-10 12:36:54 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 09:25:24 +0200 |
commit | fa6497d7ee448a8d63a52279254a7b8e84bf39dc (patch) | |
tree | 8e021d086faf0804c5a9486a97bfde38254672b6 /examples/qt3d | |
parent | 2aea59ec705d8f83e40a82f3740d4d586d88fb8e (diff) |
Compile after Math3d was changed to use float instead of qreal.
Introduced by qtbase:
51d40d7e9bdfc63c5109aef5b732aa2ba10f985a .
Fix warnings about truncation from double to float.
Introduce qFuzzyCompare() and mark some tests as
insignificant.
Task-number: QTBUG-27189
Change-Id: Icc2038df5c4c25a7fa9a89ed906a934c2af60cec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r-- | examples/qt3d/geometry/geometryview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qt3d/geometry/geometryview.cpp b/examples/qt3d/geometry/geometryview.cpp index c30e1a2e1..de51294cd 100644 --- a/examples/qt3d/geometry/geometryview.cpp +++ b/examples/qt3d/geometry/geometryview.cpp @@ -84,7 +84,7 @@ GeometryView::GeometryView(QWindow *parent) floor->setMaterialIndex(m); floor->setPosition(QVector3D(0, 0, -5)); QGraphicsScale3D *scale = new QGraphicsScale3D(floor); - scale->setScale(QVector3D(0.2, 0.2, 0.1)); + scale->setScale(QVector3D(0.2f, 0.2f, 0.1f)); floor->addTransform(scale); mdl = new QGLLightModel(this); |