diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-09-07 19:00:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-09 18:31:58 +0200 |
| commit | 6e92535dea4b91e590e594c128dc475a27f68e9a (patch) | |
| tree | b5026729c13845570d1ee23b408661a9d772e98e /src/gui/math3d | |
| parent | 67cb9e24e5cd08b07715cd1053b9cbd7ebbd560d (diff) | |
Remove temporary constructor used to make qreal->float change
The constructor being removed was needed to allow the CI to work until
commit e88f56afc2c889eede8c719b9ce7b621f49a96f9 in qtdeclarative was
merged.
This completes the move from qreal->float in QtGui/math3d.
Change-Id: I2afd108bd9398a1e6925b2885a90dbbad4d25669
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.cpp | 9 | ||||
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 899939c2c3..95cba000d4 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -101,15 +101,6 @@ QMatrix4x4::QMatrix4x4(const float *values) flagBits = General; } -// ###TODO This is temporary to get through the CI's revdep qtdeclarative tests. Remove it! -QMatrix4x4::QMatrix4x4(const double *values) -{ - for (int row = 0; row < 4; ++row) - for (int col = 0; col < 4; ++col) - m[col][row] = float(values[row * 4 + col]); - flagBits = General; -} - /*! \fn QMatrix4x4::QMatrix4x4(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44) diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 34230acf0a..1ff3288cb5 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -64,9 +64,6 @@ class Q_GUI_EXPORT QMatrix4x4 public: inline QMatrix4x4() { setToIdentity(); } explicit QMatrix4x4(const float *values); - - // ###TODO This is temporary to get through the CI's revdep qtdeclarative tests. Remove it! - explicit QMatrix4x4(const double *values); inline QMatrix4x4(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, float m31, float m32, float m33, float m34, |