AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove temporary constructor used to make qreal->float change

Browse Source 
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>
This commit is contained in:
Sean Harmer 2012-09-07 19:00:21 +01:00 committed by Qt by Nokia
parent 67cb9e24e5
commit 6e92535dea
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/math3d/qmatrix4x4.cpp
View File

@ -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)

3
src/gui/math3d/qmatrix4x4.h
View File

@ -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,