Fixes linking on iOS target with XCode 6.2.

XCode 6.2 linker complains that there are no symbols in the ArrayUtils.o file
this seems to be caused by the static methods being defined in the .h file.
Moving the definition to .cpp fixes the issue.

Change-Id: I6016a760d49e87c6abe797582ded05172e82763b
Task-number: QTBUG-46467
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

2 files changed, 37 insertions, 31 deletions

diff --git a/src/imports/qtcanvas3d/arrayutils.cpp b/src/imports/qtcanvas3d/arrayutils.cpp
index ee47b5d..796d1aa 100644
--- a/src/imports/qtcanvas3d/arrayutils.cpp
+++ b/src/imports/qtcanvas3d/arrayutils.cpp
@@ -37,4 +37,39 @@
 #include "arrayutils_p.h"
 
 QT_BEGIN_NAMESPACE
+QT_CANVAS3D_BEGIN_NAMESPACE
+
+void ArrayUtils::fillFloatArrayFromVariantList(const QVariantList  &list, float *outArray)
+{
+    int idx = 0;
+    for (QVariantList::const_iterator it = list.begin(); it != list.end(); ++it) {
+        QVariant element = *it;
+        if (element.canConvert<float>()) {
+            outArray[idx] = element.toFloat();
+        }
+        else {
+            // Conversion failed, use 0.0 as default value
+            outArray[idx] = 0.f;
+        }
+        idx++;
+    }
+}
+
+void ArrayUtils::fillIntArrayFromVariantList(const QVariantList  &list, int *outArray)
+{
+    int idx = 0;
+    for (QVariantList::const_iterator it = list.begin(); it != list.end(); ++it) {
+        QVariant element = *it;
+        if (element.canConvert<int>()) {
+            outArray[idx] = element.toInt();
+        }
+        else {
+            // Conversion failed, use 0.0 as default value
+            outArray[idx] = 0;
+        }
+        idx++;
+    }
+}
+
+QT_CANVAS3D_END_NAMESPACE
 QT_END_NAMESPACE
diff --git a/src/imports/qtcanvas3d/arrayutils_p.h b/src/imports/qtcanvas3d/arrayutils_p.h
index 51e821f..5f2c847 100644
--- a/src/imports/qtcanvas3d/arrayutils_p.h
+++ b/src/imports/qtcanvas3d/arrayutils_p.h
@@ -57,37 +57,8 @@ QT_CANVAS3D_BEGIN_NAMESPACE
 class ArrayUtils
 {
 public:
-    static void fillFloatArrayFromVariantList(const QVariantList  &list, float *outArray)
-    {
-        int idx = 0;
-        for (QVariantList::const_iterator it = list.begin(); it != list.end(); ++it) {
-            QVariant element = *it;
-            if (element.canConvert<float>()) {
-                outArray[idx] = element.toFloat();
-            }
-            else {
-                // Conversion failed, use 0.0 as default value
-                outArray[idx] = 0.f;
-            }
-            idx++;
-        }
-    }
-
-    static void fillIntArrayFromVariantList(const QVariantList  &list, int *outArray)
-    {
-        int idx = 0;
-        for (QVariantList::const_iterator it = list.begin(); it != list.end(); ++it) {
-            QVariant element = *it;
-            if (element.canConvert<int>()) {
-                outArray[idx] = element.toInt();
-            }
-            else {
-                // Conversion failed, use 0.0 as default value
-                outArray[idx] = 0;
-            }
-            idx++;
-        }
-    }
+    static void fillFloatArrayFromVariantList(const QVariantList  &list, float *outArray);
+    static void fillIntArrayFromVariantList(const QVariantList  &list, int *outArray);
 };
 
 QT_CANVAS3D_END_NAMESPACE