diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
| commit | 9dade8d2e57655019ed4dc2fcdc4e226401138a2 (patch) | |
| tree | 6aa3520f525b2ab923b4238079f1012756fa2488 /src/gui/math3d | |
| parent | e1dd37f6b54881aef3b9e1e686dc56bb96fc14ed (diff) | |
| parent | d23863952b0c13ccd8b2989d24153d94b3d3f83d (diff) | |
| download | Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.zip Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.gz Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 36ffcbe..eb87052 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1450,7 +1450,7 @@ static const qreal inv_dist_to_plane = 1. / 1024.; value of 1024 corresponds to the projection factor used by QTransform::rotate() for the x and y axes. - If \a distToPlane is zero, then the returned QTransform + If \a distanceToPlane is zero, then the returned QTransform is formed by simply dropping the third row and third column of the QMatrix4x4. This is suitable for implementing orthographic projections where the z co-ordinate should |