Update dependencies on dev in qt/qt3d

Minor adjustments to make the module compile
against latest qtbase.

Change-Id: I6159d1e326187d4d3b08af2777db81d2e5dbc277
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 10 insertions, 10 deletions

diff --git a/dependencies.yaml b/dependencies.yaml
index a169a6dbe..3bb73b7b9 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../qtbase:
-    ref: 6bbf3f0257603eb39d5511910e8bee1ed862b6cf
+    ref: 46c1e609893b09a61d70dda3589e6b8d25261468
     required: true
   ../qtdeclarative:
-    ref: 3f3c140d639813e15c95309a1356577f489ea4ff
+    ref: a7571f3ac6560b7ae2495ef32e504aff228895bc
     required: false
   ../qtshadertools:
-    ref: d0a9ff570105c64583d7314035a95e57a4c5b0da
+    ref: 81ccb330fc4b7f05d9d7c5e94bf50fb24ec95856
     required: false
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
index 5946fa4d4..9326e8580 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
@@ -122,42 +122,42 @@ void Quick3DColorValueType::setA(qreal a)
 
 void Quick3DColorValueType::setHsvHue(qreal hsvHue)
 {
-    qreal hue, saturation, value, alpha;
+    float hue, saturation, value, alpha;
     v.getHsvF(&hue, &saturation, &value, &alpha);
     v.setHsvF(hsvHue, saturation, value, alpha);
 }
 
 void Quick3DColorValueType::setHsvSaturation(qreal hsvSaturation)
 {
-    qreal hue, saturation, value, alpha;
+    float hue, saturation, value, alpha;
     v.getHsvF(&hue, &saturation, &value, &alpha);
     v.setHsvF(hue, hsvSaturation, value, alpha);
 }
 
 void Quick3DColorValueType::setHsvValue(qreal hsvValue)
 {
-    qreal hue, saturation, value, alpha;
+    float hue, saturation, value, alpha;
     v.getHsvF(&hue, &saturation, &value, &alpha);
     v.setHsvF(hue, saturation, hsvValue, alpha);
 }
 
 void Quick3DColorValueType::setHslHue(qreal hslHue)
 {
-    qreal hue, saturation, lightness, alpha;
+    float hue, saturation, lightness, alpha;
     v.getHslF(&hue, &saturation, &lightness, &alpha);
     v.setHslF(hslHue, saturation, lightness, alpha);
 }
 
 void Quick3DColorValueType::setHslSaturation(qreal hslSaturation)
 {
-    qreal hue, saturation, lightness, alpha;
+    float hue, saturation, lightness, alpha;
     v.getHslF(&hue, &saturation, &lightness, &alpha);
     v.setHslF(hue, hslSaturation, lightness, alpha);
 }
 
 void Quick3DColorValueType::setHslLightness(qreal hslLightness)
 {
-    qreal hue, saturation, lightness, alpha;
+    float hue, saturation, lightness, alpha;
     v.getHslF(&hue, &saturation, &lightness, &alpha);
     v.setHslF(hue, saturation, hslLightness, alpha);
 }
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 1cb13dc4e..cb370c313 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -41,7 +41,7 @@
 #include "qparameter_p.h"
 #include <Qt3DRender/private/renderlogging_p.h>
 #include <Qt3DRender/qtexture.h>
-
+#include <QtCore/qiterable.h>
 
 /*!
     \qmltype Parameter