qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Liang Qi 2020-06-26 15:49:18 +02:00
parent 1bd4874bd1
commit def3a50bf3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dependencies.yaml
View File

@ -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

14
tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
View File

@ -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);
}