From 5eff9e475f237246738029f9a2123f71073f1a13 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Mon, 18 May 2015 13:17:22 +0300
Subject: [PATCH] Fix uniform1iv when using javascript arrays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The uniform1iv function called internally uniform1fva when the
data was supplied in a javascript array rather than a typed array.

Change-Id: I0b2ea3495f7f9dcd8beefc7c4120e3ff8ffef6ba
Task-number: QTBUG-46166
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
 src/imports/qtcanvas3d/context3d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp
index 425c6ad..9dd2a33 100644
--- a/src/imports/qtcanvas3d/context3d.cpp
+++ b/src/imports/qtcanvas3d/context3d.cpp
@@ -2769,7 +2769,7 @@ void CanvasContext::uniform1iv(QJSValue location3D, QJSValue array)
 
     // Check if we have a JavaScript array
     if (array.isArray()) {
-        uniform1fva(locationObj, array.toVariant().toList());
+        uniform1iva(locationObj, array.toVariant().toList());
         return;
     }
 
-- 
GitLab