Update dependencies on 'dev' in qt/qtdeclarative

And workaround hash issue for now by using qHashMulti
Also, fix test build failure

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

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 6092eb855c..f32f57614d 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -3188,9 +3188,9 @@ void tst_qquickwindow::findChild()
 class DeliveryRecord : public QPair<QString, QString>
 {
 public:
-    DeliveryRecord(const QString &filter, const QString &receiver) : QPair(filter, receiver) { }
-    DeliveryRecord(const QString &receiver) : QPair(QString(), receiver) { }
-    DeliveryRecord() : QPair() { }
+    DeliveryRecord(const QString &filter, const QString &receiver) : QPair<QString, QString>(filter, receiver) { }
+    DeliveryRecord(const QString &receiver) : QPair<QString, QString>(QString(), receiver) { }
+    DeliveryRecord() : QPair<QString, QString>() { }
     QString toString() const {
         if (second.isEmpty())
             return QLatin1String("Delivery(no receiver)");