From e88f56afc2c889eede8c719b9ce7b621f49a96f9 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sat, 25 Aug 2012 11:47:53 +0100 Subject: [PATCH] Compile following qreal -> float change in QtGui/math3d classes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is needed following change https://codereview.qt-project.org/#change,33148 Change-Id: I836d4037306d1efbff48668ff8dd2b7b5ce97516 Reviewed-by: Lars Knoll Reviewed-by: Gunnar Sletta Reviewed-by: Samuel Rødal --- src/quick/util/qquickglobal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 751e65b..7d1ea9b 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 v = array->Get(i); if (!v->IsNumber()) -- 2.7.4