diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-04 07:23:11 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-04 07:23:11 (GMT) |
commit | 0097c6928f7f0ac9e07cd5f9de41d4b41e24ecc6 (patch) | |
tree | 3edc979134f835e6867a7fd80b6e1f960794cf3b /tests/benchmarks | |
parent | d2bb4091aee12af369d9f45395c45e8ef3aef20f (diff) | |
parent | e9609ad8eb1a99fc156abf43aa258e5f996d93e7 (diff) | |
download | Qt-0097c6928f7f0ac9e07cd5f9de41d4b41e24ecc6.zip Qt-0097c6928f7f0ac9e07cd5f9de41d4b41e24ecc6.tar.gz Qt-0097c6928f7f0ac9e07cd5f9de41d4b41e24ecc6.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp index b4c8202..c72bc27 100644 --- a/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp +++ b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp @@ -171,9 +171,9 @@ void tst_QMatrix4x4::multiplyDirect() QMatrix4x4 m3; - const float *m1data = m1.constData(); - const float *m2data = m2.constData(); - float *m3data = m3.data(); + const qreal *m1data = m1.constData(); + const qreal *m2data = m2.constData(); + qreal *m3data = m3.data(); QBENCHMARK { for (int row = 0; row < 4; ++row) { @@ -266,9 +266,9 @@ void tst_QMatrix4x4::mapVectorDirect() { QFETCH(QMatrix4x4, m1); - const float *m1data = m1.constData(); - float v[4] = {10.5f, -2.0f, 3.0f, 1.0f}; - float result[4]; + const qreal *m1data = m1.constData(); + qreal v[4] = {10.5f, -2.0f, 3.0f, 1.0f}; + qreal result[4]; QBENCHMARK { for (int row = 0; row < 4; ++row) { |