Compile following qreal -> float change in QtGui/math3d classes
authorSean Harmer <sean.harmer@kdab.com>
Sat, 25 Aug 2012 10:47:53 +0000 (11:47 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 7 Sep 2012 13:55:36 +0000 (15:55 +0200)
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>
src/quick/util/qquickglobal.cpp

index 751e65b..7d1ea9b 100644 (file)
@@ -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())