diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-08-25 11:47:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 15:55:36 +0200 |
| commit | e88f56afc2c889eede8c719b9ce7b621f49a96f9 (patch) | |
| tree | ea7a773a55106f5c269dd0cc14ec9708299aa2e3 /src/quick/util | |
| parent | 31d5249ae1f31394d7324650aeadfe2cd1dd622c (diff) | |
Compile following qreal -> float change in QtGui/math3d classes
This is needed following change
https://codereview.qt-project.org/#change,33148
Change-Id: I836d4037306d1efbff48668ff8dd2b7b5ce97516
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 751e65b1b5..7d1ea9b64c 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -290,7 +290,7 @@ public: static QMatrix4x4 matrix4x4FromString(const QString &s, bool *ok) { if (s.count(QLatin1Char(',')) == 15) { - qreal matValues[16]; + float matValues[16]; bool vOK = true; QString mutableStr = s; for (int i = 0; vOK && i < 16; ++i) { @@ -387,7 +387,7 @@ public: if (array->Length() != 16) return QMatrix4x4(); - qreal matVals[16]; + float matVals[16]; for (uint32_t i = 0; i < 16; ++i) { v8::Handle<v8::Value> v = array->Get(i); if (!v->IsNumber()) |