From def3a50bf32fbcd9f549609d61ab687a4e41a1e8 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Fri, 26 Jun 2020 15:49:18 +0200
Subject: [PATCH] Update dependencies on 'dev' in qt/qtdoc

Also fix tst_qqmlparser, see qtdeclarative 1b10ce6a08
and 59410dd2f5.

Change-Id: I2cf686907fbaf5c54b92ebb49f5458bdcf257672
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 dependencies.yaml                            |  6 +++---
 tests/auto/qml/qqmlparser/tst_qqmlparser.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index d553fd66e..9d0af94c3 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../qtdeclarative:
-    ref: b65eee039092fa664e781cdd98a4bb5e66815218
+    ref: d4feac29e3a3f6f3c9eb320553cd926fef1c536e
     required: true
   ../qtquickcontrols2:
-    ref: 062ba424580366fd58b680938126dffd443b67d6
+    ref: e8c4d4328d44b67214aae90120f16f728fda8115
     required: false
   ../qttools:
-    ref: f711d799e9eb86c0a9bc472f0ba092aef962f011
+    ref: 6a0aa06d404e9f851c4ba4092a223cee5c192c37
     required: true
diff --git a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
index 3381f031b..0d201a1ea 100644
--- a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
+++ b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
@@ -225,9 +225,9 @@ void tst_qqmlparser::stringLiteral()
     QVERIFY(expression);
     auto *literal = QQmlJS::AST::cast<QQmlJS::AST::StringLiteral *>(expression);
     QVERIFY(literal);
-    QCOMPARE(literal->value, "hello string");
-    QCOMPARE(literal->firstSourceLocation().begin(), 0);
-    QCOMPARE(literal->lastSourceLocation().end(), code.size());
+    QCOMPARE(literal->value, u"hello string");
+    QCOMPARE(literal->firstSourceLocation().begin(), 0u);
+    QCOMPARE(literal->lastSourceLocation().end(), quint32(code.size()));
 }
 
 void tst_qqmlparser::noSubstitutionTemplateLiteral()
@@ -246,9 +246,9 @@ void tst_qqmlparser::noSubstitutionTemplateLiteral()
     auto *literal = QQmlJS::AST::cast<QQmlJS::AST::TemplateLiteral *>(expression);
     QVERIFY(literal);
 
-    QCOMPARE(literal->value, "hello template");
-    QCOMPARE(literal->firstSourceLocation().begin(), 0);
-    QCOMPARE(literal->lastSourceLocation().end(), code.size());
+    QCOMPARE(literal->value, u"hello template");
+    QCOMPARE(literal->firstSourceLocation().begin(), 0u);
+    QCOMPARE(literal->lastSourceLocation().end(), quint32(code.size()));
 }
 
 void tst_qqmlparser::templateLiteral()
@@ -267,7 +267,7 @@ void tst_qqmlparser::templateLiteral()
     auto *templateLiteral = QQmlJS::AST::cast<QQmlJS::AST::TemplateLiteral *>(expression);
     QVERIFY(templateLiteral);
 
-    QCOMPARE(templateLiteral->firstSourceLocation().begin(), 0);
+    QCOMPARE(templateLiteral->firstSourceLocation().begin(), 0u);
     auto *e = templateLiteral->expression;
     QVERIFY(e);
 }